fixing mark bought bug and fixing bugs belongs to the last commit