Misc updates and changes. No Errors Present.