More descriptions

Closes #240
Closes #275