Add resources to catalog, and misc cleanup