fixed a buncha shit