Fix stuff, update locale
Fix JSON api