fixing mroe bugs