End of weekend changes. Minor fixes, comments, etc...