Fixes #54, Fixes #56, Fixes #57