Lots of updates, fixes. Bring code inline with latest Barebones markup