some minor data structure changes