small tweaks all over