field test and minor bugfixes