more bounce fixes