Latest fixes before splitting #74

Closed peggylind closed 6 years ago