Fixed some bugs
Merged Conflicts