Lots of tweaks/fixes/little additions/hosting fix