Completed calcFlush plus cleaned up a lor of unnecessary stuff