Minor improvements
Checkpoint, stable working with improvements