fixes everywhere

nodrawnodrawnodrawnodrawnodrawnodrawnodraw