fixed json serialized names and date format