minor tweaks and fixes