some tweaks and general housekeeping