Bugfixes. Checks removed. Comments updated.
Cleanup of old & irrelevant code.