Adding flags and fixing title