minor data and cleanup