more swimming pool changes

more code updates