More TODOs + some methods doc