Fixed the bouncing and (most of) the sticking with entities