fixed errors, now tested as working
removed unused requests