Fixes for issue #1 - Opened connections are treated as if we may have missed a close / fail.

This seems resolve #1 and has some general 'form' cleanups as well.