improved #41 Should be fixed, but needs to be reviewed. Fixed bug in shopping cart and removed unnecessary hack.