Added default checkpoint and a way to add them. Refined some code.