added answers and some fixes, small changes in hierarchy