Ficly

Comments on Phase 2 by r8r2683