More realistic orbits and some other stuff