Normalize quotes
Delete stray comma from package.json
Fix some bugs introduced by the eof refactor