Bug fixes

comas in fields. form cleanup