Fixes from master, diona verbs, Raven's fixes.

See commit log.