I'll look at the bullet points you highlighted in the parent issue and address them accordingly in a separate PR