Added a few more words. Refactored out the need for underscorejs