Additional settings update

Resolves #529

@DFurnes or @barryclark

CC: @angaither