Fixing some dependencies and adding some others (preparing pdf)