fixed gravity
merge + spike update