fixed many small stuff