Ergonomic fixes and better documentation