Added better settings and file management