Done with all the above doc suggestions (note to self).