Some cart updates and house keeping