fixing bugs..9PM