Addition of a few more missing flags and editing of content