Changed with Faux Pas and added more corrections