Small cleanup.
Added more types from BFG.

Signed-off-by: revelator <ralphengels@gmail.com>