fixing some small stuff