General Fixes

Updated some classes for interal deprecations.

Made improvements to memory and performance