code description changes and small bug fixs