fixing some bug from bug list