Fixing the figures and adding some more FIXMEs to be addressed