some style changes and fixes