more tuning

fixed pickling