fixed a few feature breaking bugs
fixes #42