Add ncc (just the getopt) and some cleanup