modified some format problems