fixed a buncha stuff