some TODO fixes