fixed weird things