Various enhancements. Added cart function.