solve minor bugs