changed implementation of global settings

and here also ;)