some format problems fixed