More cleanup, and pretty listings

`turing` is UA specific, any way to get that out? if not, add a `TODO` or `FIXME` comment