some fixes coming through

I'm trying to get butler working on github action but that is not working :[.

I plan to be semi-regularly uploading updates to this project.