General Update

This contains several updates.