Minor Changes

Re-add setPointer method

Replace underscores with spaces in Enum Names