fix errors and update bw-6960;