More modular; fixes long-standing permissions problem; new options to have more granular control over cleanup
Merge branch 'dev' into test