some format fixes