various fixes + tweaks