Updated settings, small bugfixes