Added - some settings that were commented out.