Changes to status codes and JSON content

Check it and let me know :+1: