updated to maven and fixed some JSON parsing stuff