Fixed cart and product names
Updated availability
Cleanup