various fixes
re-introduce mods (WIP)