Messages and JSDoc
Merged pull request, reorganized code, cleaned up a little
merged branch fuwaneko/master