General Update

Another update consisting of a range of changes.