Fixed a few things
Merges