Issue #141: Some updates to FLI implementation (still unfinished)