fixes from field experience