fix up settings, settings functionality