some neat tweaks