Various tweaks & bugs