big commit after a snafu with .pickle files