Beta 2.0

A lot of fixes and changes. Removed unnecessary code.