Japan prices up but deflation not over