Further general enhancements

Bootstrap enhancements, including running r10k