moved command line options around, and added runtime input