some minor adjustments form lessons learned on ec2
More edits from ec2 experiments