Thoughts + fixes from the first field-trial