Fixes some bugs and dependance on Paypal items