simpler cmds
minor nits