--
small bug fix and some minor change.