Pr 24 updates

these changes should get the PR through.