Add FORPI command line support
Clean TODOs on various files