BW15B fix some more bugs