Final polishing and updates,