added real time editing functionality and other updates