Added flags, fixed typo's