Documentation and cleanup, version 0.2