multiple fixes and mods