Public version for feedback friday, tons of updates