Some Hopefully good tweaks :)