Adjusted a few settings for convenience