added descriptions
removed unused stuff