Solar system

More improvements