closer to final, time to clean up and comment