Formated and fixed typoes