Mix of updates, damm to long since last commit