old enhancements I forgot to commit: break out modes, usage info, etc