test and minor corrections