minor changes to andy's stuff