Added some commandline stuff.