checkpoint
Fixed some oversights