Hi Steven,
Thank you, I have downloaded the latest version this morning. It fixed issue #1, but not #2.