fixed some issues with settings in regards to those who will be testing
it later.