test more general and minor bug fixes