fix bugs and ready for master