some bugs squashed.