Fixes #55. Fixes #54. Fixes #53.