some fixes and cart