Added Taxonomy component + small fixes.