edited a buncha stuff