adding timeout and rewroking some code
lots of small final pre-launch tweaks
fix typo
Merge pull request #215 from Campaign-Data-Visualization/development

Development