(1) More cleaning of hierarchies
(2) More error handling