[BF4] Improvements/bf4 parser

Some small changes.