More changes to fountain stuff