Various Updates

Various updates from the task list. See commits for details.