Correct byte run definitions
Partially fix FAT parsing errors

The correct answer is probably to use the FAT16/FAT32 mask variables.
Unfortunately, just dropping in the 16/32 mask causes an infinite loop
somewhere.