files cleaned up
improved scripting
Merge branch 'staging'