Add description option. Fix specs

Would be handy...