[REVIEW] some todos/potential bugs we should fix