More work on settings, also fixed first model