overhauled server and cleaned package.json