Various small / major tweaks