small changes - hopefully this will be good enough if we can't get databases working