Some minor adjustments
bm_read_uint16 implemented