Improvement to current employer mailing labels functionality: multline format and help text

I would like to be able to put the current employer on a seperate line the persons name. It seems this can be acheived by changes Individual Name Format input from text to textarea (near line 121 in /Admin/Form/Preferences/Address.php) to allow for input of new lines

Also the "contact.current_employer} field isn't mentioned in the help. Would be good to add "

-> current employer" to the list of available field tokens you can set for Individual Name Format in the pop up at http://sandbox.civicrm.org/civicrm/admin/setting/preferences/address?reset=1).

I might also be worth adding a note to the Mailing Label Format help box above saying something along the lines of "Note: To record the employer name for an individual, assign Current Employer using the Individual Name Format box below."