APIv2 some finalization of apiv2. Re-rigging some query/params vars, and bug-fixes