in the middle of trying to fix timestamp mess; requires further work