more CBC questions, mask bug fix