fixes #32
fixes #33
fixes #27
fixes #25
fixes #22
fixes #20
fixes #16