fix catalog; _p_changed stuff