Master scarygami

This is minor work for bringing up to speed `update.dart`