Latest fixes, take out params for REST request, clean up everything, add javadoc