Correct few things regarding categories, use json, more logs