Fixed some issues, started on financial model