various fixes
checkpoint