Update with new client fields, fix bug with units
Improve handling of checkbox values