Merging with dir changes
Small revisions to wateR