more testing and minor fixes...