Fixed typo and added TODO flags