big cleanup

catalog still needs work