A few changes
fixed conflicts
fixed width
fixed conflicts
Make master branch look like wip
Merge branch 'master' into wip