Somehow, able to fix the disappearing fields.
More corrections.