Updated, Added Checkpoints

Checkpoints added.
cleaned up