Merge branch 'misc_fixes'
Committing Current Changes to Fix Issues in Routing

Still in progress.
Merge branch 'misc_fixes'
Quick Fix on Some To Not Include In Progress Work
Merge branch 'master' into development