More cleanup, and pretty listings

add a `FIXME` here, this needs work