Various fixes, you're welcome. :)