issue 25 tweaks