status refactors
command-line refactors