small mods improvements