Alpha 3

Bugs fixed and unused code removed