fixes #28
fixed #29
did stuff