Minor updates. No finalization.