Got some bugs squashed! :-)