fixes

minor changes and style changes