Miscellaaneous modifications.