more tweaks + fixes