Added compilation!
Fixed some stage 1 bugs