Fixed most issues in initialisation, one remaining with calculating new C_t_plus_one