adding and correcting
fixed af todo