minor cleanup
various changes