FIXED some bugs where the remowal of TODO had caused some issues.