fix: multiple fixes, see details