fixed csvs to new format and fixed switching events