fixed some TODO tasks