formating and corrections