fixes #34, fixes #33, fixes #32, fixes #31