Fixed bug and some update