fixing title and a bug