Many little tweaks