minor updates due to merge