fixed some strangeities