bunch of little tweaks