main
Update and summarize more cleanly
Fix watch request json parsing error and add a unit test to prevent in future