Clean-up, docs, fixes #2, fixes #3