Some Name Fixes + Debug Strings