#432: cleanup, updated UI, specs