James C - miscelaneous changes