Adding quick switch tools and various options. Renamed a few things for clarity's sake.