Bug fixes galore!

IMPORTANT: Underscore is installed now, so you should run npm install again after pulling this down