Some control and shoppingcart (a bit too much in 1 commit too :()