checkpoint commit: testing + code clean ups