fixed mroe bugs