Final fixes to make this puppy ready for independent hosting