This isssue fixes #1, fixes #2, and fixes #3