Make ids obvious. Fixes #546. And fix undefined in class string