added more changes after tweaking settings