Updated todo's in script