Modified some small stuff