misc improvements
tidy