Corrected fields bug.
Added a few exception cases.