Tweaked some small things
Merge