clean-up; fixed format catalog issues; tested 9.2, 9.3