more testing and some other changes that drew wanted