Added type to class desc in autodecriber
Some more robustness fixes