bug fixes after field test