Optimized settings Parser and Made some minor tweaks