updates from main project

Reconcile minor updates between Starter and Full book version