Multiple fixes and tweaks