Improved descriptions
Start of defaults cleanup