WIP: organize output
BUG: typo