Cleanup/human readable repr

Supersedes #323 (includes bugfixes, merge).