housekeeping and tweaks