Final cataloguing

Fixed all the cataloguing issues