harmonize api as proposed by dodo

fixes changes proposed by @dodo in #6