Thanks for these pointers, very useful indeed - I'll look to address them in the next update.