Final commit

Fixing bugs and commiting