Added some more bells and whistles to flags