The following has been updated after further testing:

Minor bug fixes.