after user testing. fixing bugs
merging changes