Moved some things around, added knobs to cmd line