Fettled with the demo pen and tidied some bits up