- By Benjamin. Fixed eCFF bugs.