some more slight mods