Added gravity
Many fixes