Before Full Update Sweep

Updating several minor aspects of multiple functions.