Pre-Testing Update

Misc updates prior to testing