Synthetic Data (Waterville) added. Minor bug fixes