Lots of general updates - making final tweaks