minor optimisations, lowered verbosity