fixing bugs found by test team