Finished commandLineInterface, added numeric substitutions, other minor changes