Fixed some bad things