edited major and minor bugs