minor changes to names and settings