Changed a few var names and added a few fixes related to issue #3.

As reported by @Langeh, if ``options`` is omitted, the client will
crash. After a few tests, same thing is happening when you don't set the
channels option.