various changes
some style changes