Cleanup

Fixed #29, #30, some minor API issues, and generally improves documentation.