More mods and mod updates plus some cleanup.