diff --git a/CHANGELOG.md b/CHANGELOG.md
index c01ea3e..5733a22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Release 2.0.6.1
+### Bug fixes
+- Changed scheduled task loggers to debug-mode only ([#29](https://github.com/myzticbean/QSFindItemAddOn/issues/29))
+- Fix for players not getting teleported ([#30](https://github.com/myzticbean/QSFindItemAddOn/issues/30))
+
 ## Release 2.0.6.0
 ### Changes (Feature request [#23](https://github.com/myzticbean/QSFindItemAddOn/issues/23))
 - Plugin updated for Minecraft version 1.20.5.
@@ -68,3 +73,35 @@ player-shop-teleportation:
 - Fix for Issue [#24](https://gitlab.com/ronsane/QSFindItemAddOn/-/issues/24)
 - Fixed a bug related to nearest warp teleportation algorithm
 - Other minor bug fixes
+
+## Snapshot 2.0
+### Changes
+- **QuickShop-Hikari Support:** It now supports both QuickShop-Reremake and QuickShop-Hikari.
+- **Hexcode color support:** All messages in the config.yml now support hexcodes so you can get a lot more creative with colors.
+- **Different commands for players and admins**
+  - The /finditem command is now split into two:
+    - `/finditem` - This will support the usual shop searches and hiding
+    - `/finditemadmin` or `/fiadmin` - This will support plugin reloads. For example: `/fiadmin reload`.
+- **View all shops on server:** Now you can do `/finditem TO_BUY *` or `/finditem TO_SELL *` to view all shops on the server. As of this version, the sequence is always randomized. Sorting options are a work in progress.
+- **New shop visit count:** Now you can choose to display shop visits count in the shop lore in Search GUI. Just add the placeholder {SHOP_VISITS} in the "shop-gui-item-lore" in config.yml. To prevent visit spamming, a new config property "shop-player-visit-cooldown-in-minutes" has been added. Please don't use decimals here LOL.
+- **New storage format:** The "hiddenShops.json" will automatically be converted to a new file called "shops.json" which will store data of all shops along with their player visit count and whether they are hidden from searches.
+- **New Next/Back buttons:** The default next/back buttons are now fancy playerheads to make more sense. If you don't wish to use them, just specify the material in the config.yml.
+- **Customizable command aliases:** Added a new property in config.yml called "command-alias" where you can specify your own list of command aliases for /finditem command. If you don't wish to add any, just make it as:
+```yaml
+command-alias: []
+```
+- **Compatibility with QuickShop-Hikari v2.0.0.0:** Added support for Per Shop permission management for "quickshop-hikari.search". If for a shop, the shop owner Steve configures Alex to be in a group that does not have "quickshop-hikari.search" permission, then Alex won't be able to see that shop in GUI when searching.
+- **Added finditem sub-command for /qs:** Now you can try the below commands, same functionality. This feature removes the original /qs find sub-command to avoid confusion among players.
+- Added a new sample-config.yml file which will be copied over to the plugin folder. This file is just for your reference when editing the fields in the actual config.yml file.
+
+### Bug fixes
+- Removed an erroneous config field "warp-player-to-nearest-warp".
+- Fixed an issue where it will load up the plugin before QuickShop is done loading causing it to disable itself. Thanks Baran for reporting :)
+- Added support for EssentialsX /back.
+- Fixed a bug that broke autocompletes for all commands in-game.
+- Made minor bug fixes when enabling plugin.
+- Made some fixes in the search system for shops that are buying items.
+- Some other minor stability fixes.
+- Fixed bug in which the new `/qs finditem` sub-command was not showing up in `/qs help`.
+- Fixed a NullPointerException bug for PlayerWarps plugin integration.
+- Updated PlayerWarps API to latest version and fixed a NPE console error
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..8dcee44
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,675 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+                            Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+
+The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari and
+    Reremake Shop plugins for Spigot server platform.
+    Copyright (C) 2021  myzticbean
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    QSFindItemAddOn  Copyright (C) 2021  myzticbean
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index 4380a76..0000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2021 RonCreations
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/README.md b/README.md
index 3836cd5..2416b9d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Shop Search AddOn For QuickShop
-### Version: 2.0.6.0-RELEASE
+### Version: 2.0.6.1-RELEASE
 
 An unofficial add-on for the QuickShop Hikari and Reremake spigot plugin.
 Adds a `/finditem` command in game for searching through all the shops on the server.
diff --git a/pom.xml b/pom.xml
index 98f411e..a8a8b4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.myzticbean.FindItemAddOn</groupId>
     <artifactId>QSFindItemAddOn</artifactId>
-    <version>2.0.6.0-RELEASE</version>
+    <version>2.0.6.1-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>QSFindItemAddOn</name>
diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdHikariImpl.java b/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdHikariImpl.java
index 81aacbf..34f40e8 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdHikariImpl.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdHikariImpl.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Commands.QSSubCommands;
 
 import com.ghostchu.quickshop.api.command.CommandHandler;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdReremakeImpl.java b/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdReremakeImpl.java
index cb53a55..3341ebc 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdReremakeImpl.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdReremakeImpl.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Commands.QSSubCommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -14,6 +32,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class FindItemCmdReremakeImpl implements CommandHandler<Player> {
 
     private final String hideSubCommand;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/BuySubCmd.java b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/BuySubCmd.java
index 870fdbe..a1eda93 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/BuySubCmd.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/BuySubCmd.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Commands.SAPICommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/HideShopSubCmd.java b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/HideShopSubCmd.java
index caf1604..bf6c2ee 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/HideShopSubCmd.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/HideShopSubCmd.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Commands.SAPICommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/ReloadSubCmd.java b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/ReloadSubCmd.java
index 9f4342a..d7f9f51 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/ReloadSubCmd.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/ReloadSubCmd.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Commands.SAPICommands;
 
 import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RestartSubCmd.java b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RestartSubCmd.java
index ce12d7e..2209a2c 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RestartSubCmd.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RestartSubCmd.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Commands.SAPICommands;
 
 import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RevealShopSubCmd.java b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RevealShopSubCmd.java
index bb72966..57918b5 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RevealShopSubCmd.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RevealShopSubCmd.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Commands.SAPICommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/SellSubCmd.java b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/SellSubCmd.java
index 922d1db..d9702ce 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/SellSubCmd.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/SellSubCmd.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Commands.SAPICommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
diff --git a/src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigProvider.java b/src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigProvider.java
index 32b0871..2babf8b 100644
--- a/src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigProvider.java
+++ b/src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigProvider.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.ConfigUtil;
 
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
@@ -8,6 +26,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class ConfigProvider {
 
     private static final String FIND_ITEM_COMMAND = "find-item-command.";
@@ -41,7 +62,7 @@ public class ConfigProvider {
     public final String SHOP_SEARCH_GUI_TITLE = ConfigSetup.get().getString("shop-search-gui-title");
     public final int NEAREST_WARP_MODE = ConfigSetup.get().getInt("nearest-warp-mode");
     public final List<String> SHOP_GUI_ITEM_LORE = (List<String>) ConfigSetup.get().getList("shop-gui-item-lore");
-    public final boolean TP_PLAYER_DIRECTLY_TO_SHOP = ConfigSetup.get().getBoolean(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + " tp-player-directly-to-shop");
+    public final boolean TP_PLAYER_DIRECTLY_TO_SHOP = ConfigSetup.get().getBoolean(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "tp-player-directly-to-shop");
     public final String CLICK_TO_TELEPORT_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "click-to-teleport-message");
     public final String SHOP_TP_NO_PERMISSION_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "shop-tp-no-permission-message");
     public final String UNSAFE_SHOP_AREA_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "unsafe-shop-area-message");
diff --git a/src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigSetup.java b/src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigSetup.java
index 945f71f..f127e8a 100644
--- a/src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigSetup.java
+++ b/src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigSetup.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.ConfigUtil;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -10,6 +28,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class ConfigSetup {
 
     private static File configFile;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Dependencies/EssentialsXPlugin.java b/src/main/java/io/myzticbean/finditemaddon/Dependencies/EssentialsXPlugin.java
index 8da73a9..7db9e06 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Dependencies/EssentialsXPlugin.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Dependencies/EssentialsXPlugin.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Dependencies;
 
 import com.earth2me.essentials.Essentials;
@@ -39,7 +57,6 @@ public static Essentials getAPI() {
 
     public static void updateAllWarps() {
         long start = System.currentTimeMillis();
-//        LoggerUtils.logInfo("Updating Essentials warps list...");
         if(essAPI.isEnabled()) {
             Collection<String> allWarps = EssentialsXPlugin.getAPI().getWarps().getList();
             allWarpsList = new ArrayList<>();
@@ -52,7 +69,7 @@ public static void updateAllWarps() {
                 } catch (Exception ignored) { }
             });
         }
-        LoggerUtils.logInfo("Update complete for Essentials warps list! Found " + getAllWarps().size() + " warps. Time took: " + (System.currentTimeMillis() - start) + "ms.");
+        LoggerUtils.logDebugInfo("Update complete for Essentials warps list! Found " + getAllWarps().size() + " warps. Time took: " + (System.currentTimeMillis() - start) + "ms.");
     }
 
 }
diff --git a/src/main/java/io/myzticbean/finditemaddon/Dependencies/PWarpPlugin.java b/src/main/java/io/myzticbean/finditemaddon/Dependencies/PWarpPlugin.java
index 4c9ef67..6fb3799 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Dependencies/PWarpPlugin.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Dependencies/PWarpPlugin.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Dependencies;
 
 //import me.ronsane.finditemaddon.finditemaddon.Utils.LoggerUtils;
@@ -6,6 +24,9 @@
 //import me.tks.playerwarp.WarpList;
 //import org.bukkit.Bukkit;
 
+/**
+ * @author myzticbean
+ */
 public class PWarpPlugin {
 
 //    private static PWarp pWarp = null;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Dependencies/PlayerWarpsPlugin.java b/src/main/java/io/myzticbean/finditemaddon/Dependencies/PlayerWarpsPlugin.java
index bf32985..e8792b3 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Dependencies/PlayerWarpsPlugin.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Dependencies/PlayerWarpsPlugin.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Dependencies;
 
 import com.olziedev.playerwarps.api.PlayerWarpsAPI;
@@ -11,6 +29,9 @@
 
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerWarpsPlugin {
 
     private static boolean isEnabled = false;
@@ -51,11 +72,10 @@ public static List<Warp> getAllWarps() {
     public static void updateAllWarpsFromAPI() {
         if(isEnabled) {
             long start = System.currentTimeMillis();
-//            LoggerUtils.logInfo("Updating Player warps list...");
             // Issue #24 Fix: Changing api instance to callback
             PlayerWarpsAPI.getInstance(api -> {
                 allWarpsList = api.getPlayerWarps(false);
-                LoggerUtils.logInfo("Update complete for PlayerWarps list! Found " + getAllWarps().size() + " warps. Time took: " + (System.currentTimeMillis() - start) + "ms.");
+                LoggerUtils.logDebugInfo("Update complete for PlayerWarps list! Found " + getAllWarps().size() + " warps. Time took: " + (System.currentTimeMillis() - start) + "ms.");
             });
         }
     }
diff --git a/src/main/java/io/myzticbean/finditemaddon/Dependencies/WGPlugin.java b/src/main/java/io/myzticbean/finditemaddon/Dependencies/WGPlugin.java
index 6f89ac0..4546000 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Dependencies/WGPlugin.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Dependencies/WGPlugin.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Dependencies;
 
 import com.sk89q.worldguard.WorldGuard;
@@ -5,6 +23,9 @@
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
 import org.bukkit.Bukkit;
 
+/**
+ * @author myzticbean
+ */
 public class WGPlugin {
 
     private static boolean isPluginEnabled;
diff --git a/src/main/java/io/myzticbean/finditemaddon/FindItemAddOn.java b/src/main/java/io/myzticbean/finditemaddon/FindItemAddOn.java
index f82ef15..ba18632 100644
--- a/src/main/java/io/myzticbean/finditemaddon/FindItemAddOn.java
+++ b/src/main/java/io/myzticbean/finditemaddon/FindItemAddOn.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon;
 
 import io.myzticbean.finditemaddon.Commands.SAPICommands.*;
@@ -35,6 +53,9 @@
 import java.util.HashMap;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public final class FindItemAddOn extends JavaPlugin {
 
     // ONLY FOR SNAPSHOT BUILDS
@@ -71,7 +92,7 @@ public void onLoad() {
     public void onEnable() {
 
         if(ENABLE_TRIAL_PERIOD) {
-            LoggerUtils.logWarning("THIS IS A TRIAL BUILD!!!");
+            LoggerUtils.logWarning("THIS IS A TRIAL BUILD!");
             LocalDateTime trialEndDate = LocalDate.of(TRIAL_END_YEAR, TRIAL_END_MONTH, TRIAL_END_DAY).atTime(LocalTime.MIDNIGHT);
             LocalDateTime today = LocalDateTime.now();
             Duration duration = Duration.between(trialEndDate, today);
diff --git a/src/main/java/io/myzticbean/finditemaddon/Handlers/CommandHandler/CmdExecutorHandler.java b/src/main/java/io/myzticbean/finditemaddon/Handlers/CommandHandler/CmdExecutorHandler.java
index ee8ebea..9887375 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Handlers/CommandHandler/CmdExecutorHandler.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Handlers/CommandHandler/CmdExecutorHandler.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Handlers.CommandHandler;
 
 import io.myzticbean.finditemaddon.ConfigUtil.ConfigSetup;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menu.java b/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menu.java
index fdeb217..6ad0e2b 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menu.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menu.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Handlers.GUIHandler;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -16,6 +34,7 @@
 /**
  * Based on an awesome tutorial from https://www.youtube.com/watch?v=xebH6M_7k18
  * Gui pagination: https://www.youtube.com/watch?v=e80NO9Pgz7s
+ * @author myzticbean
  */
 public abstract class Menu implements InventoryHolder {
 
diff --git a/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menus/FoundShopsMenu.java b/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menus/FoundShopsMenu.java
index 14ba5a6..1834a17 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menus/FoundShopsMenu.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menus/FoundShopsMenu.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Handlers.GUIHandler.Menus;
 
 import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
@@ -147,7 +165,8 @@ else if(event.getCurrentItem().getType().equals(Material.AIR)) {
                     }
                     else {
                         if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_TP_NO_PERMISSION_MSG)) {
-                            playerMenuUtility.getOwner()
+                            playerMenuUtility
+                                    .getOwner()
                                     .sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
                                             + FindItemAddOn.getConfigProvider().SHOP_TP_NO_PERMISSION_MSG));
                             event.getWhoClicked().closeInventory();
@@ -169,7 +188,6 @@ else if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2) {
             }
             else {
                 LoggerUtils.logError("PersistentDataContainer doesn't have the right kind of data!");
-                return;
             }
         }
     }
diff --git a/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PaginatedMenu.java b/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PaginatedMenu.java
index fce16d4..ab90663 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PaginatedMenu.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PaginatedMenu.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Handlers.GUIHandler;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -13,6 +31,9 @@
 import java.util.List;
 import java.util.UUID;
 
+/**
+ * @author myzticbean
+ */
 public abstract class PaginatedMenu extends Menu {
     protected int page = 0;
     protected final int maxItemsPerPage = 45;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PlayerMenuUtility.java b/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PlayerMenuUtility.java
index f0bb4b0..00eb379 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PlayerMenuUtility.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PlayerMenuUtility.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Handlers.GUIHandler;
 
 import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
@@ -5,6 +23,9 @@
 
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerMenuUtility {
     private Player owner;
 
diff --git a/src/main/java/io/myzticbean/finditemaddon/Listeners/MenuListener.java b/src/main/java/io/myzticbean/finditemaddon/Listeners/MenuListener.java
index 699ee33..5d9bc68 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Listeners/MenuListener.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Listeners/MenuListener.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Listeners;
 
 import io.myzticbean.finditemaddon.Handlers.GUIHandler.Menu;
@@ -6,6 +24,9 @@
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.InventoryHolder;
 
+/**
+ * @author myzticbean
+ */
 public class MenuListener implements Listener {
 
     @EventHandler
diff --git a/src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpCreateEventListener.java b/src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpCreateEventListener.java
index a075004..91e5fb3 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpCreateEventListener.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpCreateEventListener.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Listeners;
 
 import com.olziedev.playerwarps.api.events.warp.PlayerWarpCreateEvent;
@@ -7,6 +25,9 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+/**
+ * @author myzticbean
+ */
 public class PWPlayerWarpCreateEventListener implements Listener {
     @EventHandler
     public void onPlayerWarpCreate(PlayerWarpCreateEvent event) {
diff --git a/src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpRemoveEventListener.java b/src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpRemoveEventListener.java
index b205f18..a59e108 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpRemoveEventListener.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpRemoveEventListener.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Listeners;
 
 import com.olziedev.playerwarps.api.events.warp.PlayerWarpRemoveEvent;
@@ -7,6 +25,9 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+/**
+ * @author myzticbean
+ */
 public class PWPlayerWarpRemoveEventListener implements Listener {
     @EventHandler
     public void onPlayerWarpRemove(PlayerWarpRemoveEvent event) {
diff --git a/src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerCommandSendEventListener.java b/src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerCommandSendEventListener.java
index 7539b10..aa014e1 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerCommandSendEventListener.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerCommandSendEventListener.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Listeners;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -8,6 +26,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerCommandSendEventListener implements Listener {
     @EventHandler
     public void onPlayerCommandTab(PlayerCommandSendEvent event) {
diff --git a/src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerJoinEventListener.java b/src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerJoinEventListener.java
index 9791fb4..eff5396 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerJoinEventListener.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerJoinEventListener.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Listeners;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -6,6 +24,9 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerJoinEventListener implements Listener {
 
     @EventHandler
diff --git a/src/main/java/io/myzticbean/finditemaddon/Listeners/PluginEnableEventListener.java b/src/main/java/io/myzticbean/finditemaddon/Listeners/PluginEnableEventListener.java
index 2325dd8..aacd0f7 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Listeners/PluginEnableEventListener.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Listeners/PluginEnableEventListener.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Listeners;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -5,6 +23,9 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginEnableEvent;
 
+/**
+ * @author myzticbean
+ */
 public class PluginEnableEventListener implements Listener {
     @EventHandler
     public void onPluginEnable(PluginEnableEvent event) {
diff --git a/src/main/java/io/myzticbean/finditemaddon/Models/CachedShop.java b/src/main/java/io/myzticbean/finditemaddon/Models/CachedShop.java
index e4857a2..5b05276 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Models/CachedShop.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Models/CachedShop.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Models;
 
 import lombok.Builder;
@@ -6,6 +24,9 @@
 
 import java.util.Date;
 
+/**
+ * @author myzticbean
+ */
 @Getter @Builder
 public class CachedShop {
     private long shopId;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Models/EssentialWarpModel.java b/src/main/java/io/myzticbean/finditemaddon/Models/EssentialWarpModel.java
index e055eb6..46f030b 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Models/EssentialWarpModel.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Models/EssentialWarpModel.java
@@ -1,7 +1,28 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Models;
 
 import org.bukkit.Location;
 
+/**
+ * @author myzticbean
+ */
 public class EssentialWarpModel {
     public String warpName;
     public Location warpLoc;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Models/FoundShopItemModel.java b/src/main/java/io/myzticbean/finditemaddon/Models/FoundShopItemModel.java
index 58e6060..e20066f 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Models/FoundShopItemModel.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Models/FoundShopItemModel.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Models;
 
 import lombok.AllArgsConstructor;
@@ -9,6 +27,7 @@
 
 /**
  * Model for the Shop Item lore that will be shown in the search GUI
+ * @author myzticbean
  */
 @Getter
 @AllArgsConstructor
diff --git a/src/main/java/io/myzticbean/finditemaddon/Models/HiddenShopModel.java b/src/main/java/io/myzticbean/finditemaddon/Models/HiddenShopModel.java
index 2bf6eca..3c761af 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Models/HiddenShopModel.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Models/HiddenShopModel.java
@@ -1,8 +1,29 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Models;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * @author myzticbean
+ */
 @AllArgsConstructor
 @Getter
 public class HiddenShopModel {
@@ -15,70 +36,4 @@ public class HiddenShopModel {
     private float yaw;
     private String shopOwnerUUID;
 
-//    public HiddenShopModel(String worldName, double x, double y, double z, float pitch, float yaw, String shopOwnerUUID) {
-//        this.worldName = worldName;
-//        this.x = x;
-//        this.y = y;
-//        this.z = z;
-//        this.pitch = pitch;
-//        this.yaw = yaw;
-//        this.shopOwnerUUID = shopOwnerUUID;
-//    }
-//
-//    public String getWorldName() {
-//        return worldName;
-//    }
-//
-//    public void setWorldName(String worldName) {
-//        this.worldName = worldName;
-//    }
-//
-//    public double getX() {
-//        return x;
-//    }
-//
-//    public void setX(double x) {
-//        this.x = x;
-//    }
-//
-//    public double getY() {
-//        return y;
-//    }
-//
-//    public void setY(double y) {
-//        this.y = y;
-//    }
-//
-//    public double getZ() {
-//        return z;
-//    }
-//
-//    public void setZ(double z) {
-//        this.z = z;
-//    }
-//
-//    public float getPitch() {
-//        return pitch;
-//    }
-//
-//    public void setPitch(float pitch) {
-//        this.pitch = pitch;
-//    }
-//
-//    public float getYaw() {
-//        return yaw;
-//    }
-//
-//    public void setYaw(float yaw) {
-//        this.yaw = yaw;
-//    }
-//
-//    public String getShopOwnerUUID() {
-//        return shopOwnerUUID;
-//    }
-//
-//    public void setShopOwnerUUID(String shopOwnerUUID) {
-//        this.shopOwnerUUID = shopOwnerUUID;
-//    }
-
 }
diff --git a/src/main/java/io/myzticbean/finditemaddon/Models/PlayerShopVisitModel.java b/src/main/java/io/myzticbean/finditemaddon/Models/PlayerShopVisitModel.java
index da21c7d..caee3aa 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Models/PlayerShopVisitModel.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Models/PlayerShopVisitModel.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Models;
 
 import lombok.AllArgsConstructor;
@@ -6,6 +24,9 @@
 import java.time.Instant;
 import java.util.UUID;
 
+/**
+ * @author myzticbean
+ */
 @AllArgsConstructor
 @NoArgsConstructor
 public class PlayerShopVisitModel {
diff --git a/src/main/java/io/myzticbean/finditemaddon/Models/ShopSearchActivityModel.java b/src/main/java/io/myzticbean/finditemaddon/Models/ShopSearchActivityModel.java
index f987653..ab990bb 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Models/ShopSearchActivityModel.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Models/ShopSearchActivityModel.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Models;
 
 import lombok.AllArgsConstructor;
@@ -7,6 +25,9 @@
 
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 @AllArgsConstructor
 @Getter
 @Setter
diff --git a/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSApi.java b/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSApi.java
index bc857ac..cd248b4 100644
--- a/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSApi.java
+++ b/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSApi.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.QuickShopHandler;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
diff --git a/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSHikariAPIHandler.java b/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSHikariAPIHandler.java
index f1d3d41..078fc6a 100644
--- a/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSHikariAPIHandler.java
+++ b/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSHikariAPIHandler.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.QuickShopHandler;
 
 import cc.carm.lib.easysql.api.SQLQuery;
@@ -36,7 +54,6 @@
 
 /**
  * Implementation of QSApi for Hikari
- *
  * @author myzticbean
  */
 public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
@@ -255,7 +272,7 @@ public List<ShopSearchActivityModel> syncShopsListForStorage(List<ShopSearchActi
             if (tempShopToRemove != null)
                 globalShopsList.remove(tempShopToRemove);
         }
-        LoggerUtils.logInfo("Shops List sync complete. Time took: " + (System.currentTimeMillis() - start) + "ms.");
+        LoggerUtils.logDebugInfo("Shops List sync complete. Time took: " + (System.currentTimeMillis() - start) + "ms.");
         return tempGlobalShopsList;
     }
 
diff --git a/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSReremakeAPIHandler.java b/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSReremakeAPIHandler.java
index 096fcbc..f3a51e4 100644
--- a/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSReremakeAPIHandler.java
+++ b/src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSReremakeAPIHandler.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.QuickShopHandler;
 
 import io.myzticbean.finditemaddon.Commands.QSSubCommands.FindItemCmdReremakeImpl;
diff --git a/src/main/java/io/myzticbean/finditemaddon/ScheduledTasks/Task15MinInterval.java b/src/main/java/io/myzticbean/finditemaddon/ScheduledTasks/Task15MinInterval.java
index faef4e2..57914b8 100644
--- a/src/main/java/io/myzticbean/finditemaddon/ScheduledTasks/Task15MinInterval.java
+++ b/src/main/java/io/myzticbean/finditemaddon/ScheduledTasks/Task15MinInterval.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.ScheduledTasks;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/CommonUtils.java b/src/main/java/io/myzticbean/finditemaddon/Utils/CommonUtils.java
index ba6d53d..de531af 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/CommonUtils.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/CommonUtils.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils;
 
 import me.kodysimpson.simpapi.colors.ColorTranslator;
@@ -5,6 +23,9 @@
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
+/**
+ * @author myzticbean
+ */
 public class CommonUtils {
 
     public static String parseColors(String msg) {
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/NearestWarpModeEnum.java b/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/NearestWarpModeEnum.java
index 3ab94a2..ba8a5d4 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/NearestWarpModeEnum.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/NearestWarpModeEnum.java
@@ -1,5 +1,26 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.Defaults;
 
+/**
+ * @author myzticbean
+ */
 public enum NearestWarpModeEnum {
 
     ESSENTIAL_WARPS(1),
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/PlayerPermsEnum.java b/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/PlayerPermsEnum.java
index 40e355d..01e0666 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/PlayerPermsEnum.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/PlayerPermsEnum.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.Defaults;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/ShopLorePlaceholdersEnum.java b/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/ShopLorePlaceholdersEnum.java
index f73e8ad..4be27e7 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/ShopLorePlaceholdersEnum.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/ShopLorePlaceholdersEnum.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.Defaults;
 
 /**
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/HiddenShopStorageUtil.java b/src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/HiddenShopStorageUtil.java
index a4ae77d..38c23f9 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/HiddenShopStorageUtil.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/HiddenShopStorageUtil.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.JsonStorageUtils;
 
 import com.google.gson.Gson;
@@ -16,6 +34,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class HiddenShopStorageUtil {
 
     protected static List<HiddenShopModel> hiddenShopsList = new ArrayList<>();
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/ShopSearchActivityStorageUtil.java b/src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/ShopSearchActivityStorageUtil.java
index 1fb7934..74ecb48 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/ShopSearchActivityStorageUtil.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/ShopSearchActivityStorageUtil.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.JsonStorageUtils;
 
 import com.google.gson.Gson;
@@ -22,6 +40,9 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+/**
+ * @author myzticbean
+ */
 public class ShopSearchActivityStorageUtil {
 
     private static final String SHOP_SEARCH_ACTIVITY_JSON_FILE_NAME = "shops.json";
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/LocationUtils.java b/src/main/java/io/myzticbean/finditemaddon/Utils/LocationUtils.java
index faf9383..264ab75 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/LocationUtils.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/LocationUtils.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -11,7 +29,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-
+/**
+ * @author myzticbean
+ */
 public class LocationUtils {
 
     private static final List<Material> damagingBlocks = new ArrayList<>();
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/LoggerUtils.java b/src/main/java/io/myzticbean/finditemaddon/Utils/LoggerUtils.java
index fb3ca44..b89ba7e 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/LoggerUtils.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/LoggerUtils.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -10,7 +28,7 @@
 public class LoggerUtils {
 
     public static final String QS_FIND_ITEM_ADD_ON = "[QSFindItemAddOn] ";
-    public static final String QS_FIND_ITEM_ADD_ON_DEBUG_LOG = "[QSFindItemAddOn-DebugLog] ";
+    public static final String QS_FIND_ITEM_ADD_ON_DEBUG_LOG = "[QSFindItemAddOn-DEBUG] ";
 
     public static void logDebugInfo(String text) {
         if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/UpdateChecker.java b/src/main/java/io/myzticbean/finditemaddon/Utils/UpdateChecker.java
index 0860c6e..239a672 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/UpdateChecker.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/UpdateChecker.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -13,6 +31,9 @@
 import java.util.Scanner;
 import java.util.function.Consumer;
 
+/**
+ * @author myzticbean
+ */
 public class UpdateChecker {
 
     private final String prefix = "&8["
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/EssentialWarpsUtil.java b/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/EssentialWarpsUtil.java
index 6cbafc9..f137a1a 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/EssentialWarpsUtil.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/EssentialWarpsUtil.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.WarpUtils;
 
 import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
@@ -10,6 +28,9 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+/**
+ * @author myzticbean
+ */
 public class EssentialWarpsUtil {
 
     @Nullable
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/PlayerWarpsUtil.java b/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/PlayerWarpsUtil.java
index 1926c14..72c8a0f 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/PlayerWarpsUtil.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/PlayerWarpsUtil.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.WarpUtils;
 
 import com.olziedev.playerwarps.api.warp.Warp;
@@ -13,6 +31,9 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerWarpsUtil {
 
     @Nullable
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WGRegionUtils.java b/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WGRegionUtils.java
index af37f01..5e7a868 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WGRegionUtils.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WGRegionUtils.java
@@ -1,3 +1,21 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.WarpUtils;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -9,6 +27,9 @@
 
 import java.util.*;
 
+/**
+ * @author myzticbean
+ */
 public class WGRegionUtils {
 
     @Nullable
diff --git a/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WarpUtils.java b/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WarpUtils.java
index 4c76643..b5746af 100644
--- a/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WarpUtils.java
+++ b/src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WarpUtils.java
@@ -1,21 +1,41 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon.Utils.WarpUtils;
 
 import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
 import io.myzticbean.finditemaddon.Dependencies.PlayerWarpsPlugin;
 import io.myzticbean.finditemaddon.FindItemAddOn;
 
+/**
+ * @author myzticbean
+ */
 public class WarpUtils {
     public static void updateWarps() {
         if(FindItemAddOn.getConfigProvider().shopGUIItemLoreHasKey("{NEAREST_WARP}")) {
-            if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 1) {
-                if(EssentialsXPlugin.isEnabled()) {
-                    EssentialsXPlugin.updateAllWarps();
-                }
+            if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 1
+                    && EssentialsXPlugin.isEnabled()) {
+                EssentialsXPlugin.updateAllWarps();
+
             }
-            else if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2) {
-                if(PlayerWarpsPlugin.getIsEnabled()) {
-                    PlayerWarpsPlugin.updateAllWarpsFromAPI();
-                }
+            else if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2
+                    && PlayerWarpsPlugin.getIsEnabled()) {
+                PlayerWarpsPlugin.updateAllWarpsFromAPI();
             }
         }
     }