many formating additions and corrections