updates with W8 TODO's