Added gravity and fixed custom player attributes not merging properly