Some other minor improvements and a bug fix in the boilerplate
Add two missing contributors Bumped patch due to changed introduced with 0583a6a904