Additional fixes to last commit

Gravity turned on and nicer structure