change bounce a bit, more tests/fixes