fixing done

so many problems from one fix :(