some mods and additions