Title change and code fixes