changes after Mexico

Lots of updates based on lessons learned in Mexico