tidy up & catch small tweaks