more tweaks and fixes