Fixed command line entries, no longer need to run from Terminal