More cleanup, and pretty listings

also `-` vs `_` in filename