modified some small stuff