Some updates. See commits.