Further adjustments less failing tests
Further tweaking

Reviewing remaining broken elements