Add better body, fix bouncing issues