Fixed servers, added some JSON hooks