Various updates to functionality.