document the code a little bit more and bump year in copyright messages
merge 'options' in parts to allow establishing defaults incrementally