fixing small stuff