added TODOs
updated f.l check line