small bug fix and some updates