@nightshining overall updates