Adjusted JSON output + other small changes