Got a few settings added, some dont yet work