Add fields and french

Merges with master and fixes two of the issues