fixed errors, combine like items in cart