made incremental reflow optional, and fixed warnings