fixed this as well and squashed all the tweaks into one commit.