cleaning up data, making sure everything runs okay
fixing up tests, params.properties stuff
cleaning up data stuff -- hopefully its fast enough for travis