Alpha Build 10

Fixed many stupid bugs and cleaned up code layout