Fixed some bad mistakes