stuff

fixes #17, fixes #8  and mooore