>So everything now works?

Yes, Awesomely! Thanks for asking and the time you've taken to review the code.