expanded testing, caught a few bugs