SimpleCashFlow + many bug fixes