++decimal field, refactor, fixes