LF small comments; need to still fix a few figures