minor bugs solving