Second commit bomb

Added command line options and some more cleanups