Adding rbarnes and some minor changes