fixes #16
fixes #13
fixes #12
fixes #11