update entities + fix bug