I gang

Magento fixes part 2