some todos added, Update action bug fixed