clean up command line, add upgrade/bundle options