Fixed more bugs
Merged