Fixed bug and various update.