add fix on inline edit issue and updated TODO tracker