Added minor fields and fixed decimal issue

See commit comment.