Merging
Fixing some errors