onGridReady event & TODO fixes