clean up main directory and script options
add dates
Merge commit 'github/testing' into beta