Fixing some bugs
Merging