updates to final touches of 'finishing phase 1' changes by kadenbach