Minor changes
Work in progress.