Fixed settings and stuff