fixes #18, #9, #2, remedies #15