Bug fix

Can't be having array out-of-bounds errors, now can we?

Start of something

The API leaves much to be desired, and I'm certain much of the "core functionality" will be massively changed soon^tm.