animations
!
gravity flippin
did some code cleanup
fixed merge conflicts