misc working file work
more changes.
cistern file work