WIP... small mods