Various Fixes and Namespace Corrections

<see summary>