Many updates and fixes in response to Owen Ambur's feedback.
Update add-on.