Fixed lots of errors
Lots of improvement and bug fixes