evaluation checkpoint
minor changes and TODOs