working on #114, some little changes