Cleanups

Quick fixes: remove use of pass-by-ref, thank you Oldies!
Restore settings mistaken fix (!), thank you Josh.