minor new data and cleanup