a few more of my own changes