entity system last improvements