bug and data fixes