Some minor bugs and ready to test