FIXED some TODOs