reorganizing, new include for getopt, new tool for tagging manually