* minor fixes * Consolidate into globalCtx * fix error * Fix Warnings Co-authored-by: engineer124 <engineer124enginer124@gmail.com>