Better bouncing. Replaying. Bugs fixed