Mostly fixed the moon dots issue