Killed some major bugs