misc
some diagnostic stuff
typo
typo2
small cleanup