Make over

Made quite a few adjustments.