Improvements and fixes of the pac