fixed some bad things