Final Changes

Quick Note: I gave credit even if I just got the idea from some person,
but I figured it was better to be safe.