I added a few more tweaks for Jarrod

one pull request leads to another :)