Adding the moon, some polishing