Description and fixes