Fixed some small errors. Started working on the JSON to return to the database team.