Add command line options, fix for faster machine, organize for better dev. (KK)