Fixed minor getopt_long issues. Added TODO.