Acidentally sent this just to Efraim the first time, sorry you'll get it
twice...

Thanks for the feedback, I think I've fixed all the issues in the
(actually attached) patches included here.