FIXED: Table names are now pluralized
FIXED: Some basic fixes for the cart