fix little bugs
I completed until test for bitmap logic.
Merge branch 'rfrost'