Added combo mode and fixed store bugs