minor fixes
more bugs squashed