fixes

fixes and style changes.