changed a buncha things