Warnings removed, very silly bug in CLI removed.