Cleanup, and attempt to keep the sun more stable