fixing bugs..