Various small tweaks after rythie feedback