Settings and rename now working