Added NICK support and fixed a minor bug where our user isn't added.
Improved formatting and alphabetted methods.