Improvements and bugfixes.

There should be a space between description and name