another couple bugs squashed