Some code rework so the entities render properly in client / server mode & other fixes