deal with some TODO's