fixed some bugs, busy building checkout
fixed small mistake