correct major bugs