fix some format problems