Fixed typo in filename
Added FIXMEs