Test for NaN
Improved stability
Added simple solar system