more testing, minor changes