Lots of additions to multiple lists.

Large update.