Tweaking a couple of settings

and changed it so it would always return a value no matter if errors
occurred (and trying to fix those errors as well)