Works from commandline argument, updated comments