More mods, miscellaneous improvements