Fixed forgotten addition - don't flush if we are already flushing - doh! thought I had that one comitted already...
Deleted a few commented out lines from last commit