some fixes/mods