Many bugs fixed!!!

Blah blah blah