integrated changes on XEngine with newest cleanup work from fine
added cleanups from fine in Addons