Animation and JSON bug fixes