Minor changes to bitfield and unchoke

(renamed a few variables)