Hardened code, cleaned up, expanded test cases.