some minor tweaks and fixes