Some more mods and tweaks