cleaner config and units cmds
plan improvements