cleaned up code, typedef long map/tuple and set travis back to running tests