Further bounce implementation/fixes