PAA/PAAPD in draft info, a few bug fixes in undrafting