name change and some small stuff