fixed problems according to comments in GitHub and fixed some issues according to PrestaShop validator