various style changes
merged checkpoint