Fixes

Resolves #98 
improvements to enable rapid deployment