Final document updates and code changes