more pubspec template changes; added a speculative --machine option