more testing and minor bug fixes