Add argument working. Slightly better option parser.