checking some TODOs which have been done in previous commits