Updated some router descriptors.
Fixed handling of None capabilities.
Fixed quotes.