Fixed some bug and typo that was made in the previous release.