checkpoint and bugfix