Cleanup and more progress. Turtles :D