more cleanup
fix comparison to Done