fixing a few bugs after qa testing