Comments added, todo updated