more bugs squashed -still lots to do...