Few minor adjustments and updates.