Pre-launch round of changes

Signed-off-by: Chad Allen <chad@awsmlabs.com>