initial improvements to polyathlon sketch