- Various bug fixes and improvements to the flow through the scaffolding.