IV drip fix.

- Fixed #3450 and other oversights, cleaned code.