Add some missing descriptions, fix the order of others.