some small stuff changed