fixed a couple things so far