Adds style changes
Makes minor changes
Merge branch 'more'