Cleanup
Documentation and new features (group by, ...)