tweaks, and use 0.17.1 - should refactor stats some more here