more testing
more fixes