added user preferences, stopped global tracking of entities