minor updates
trying to merge...