Moved bounce setter into a more sensible place
Fixed that scrolling bug