Bug fix and description update