resolved some TODO's