fixes according to discussion in #8