fixing some bad things