Added description and other fixes