Change from spoon.js to spoonjs, other tweaks.