Added & tweaked some settings