Bug fixes and expanded package.json