Additional fixes, and move Tags over to JSON