Fixed FIXMEs. Added TP on LD.