piff and fixes