fixed the stuff my half merge messed up