changed more small stuff