checkpoint
fixes and cleanups