Mike

Multiple updates to several files.