lots of updates mostly from Austin that were not versioned for awhile