cleaned up old files; minor tweaks to catalog api