number formatter for mapper and foreignKey case fixed to soothe my ocdd
Merge sean's changes.