Fixing number field issues (Closes #224, closes #222)