more testing, bug fixes