fixed borken functions and other stuff
fixed config
fixed merge conflicts