worked on settings and minor stuff