some more changes

props to @cweiske