More comments + typo. Added 2 FIXMEs...