Added Megento and some clean-up