more fixes/mods