Tidying.
Additional spec's for Talk.