Checkpoints, bugfixes, moved back weapon upgrade