Add Description and few fixes