minor bugs solved