Checkpoint - seems to be working now
Enabled other modes, fixed bugs