Updated WFM forms, some language fixes