Bleeding edge

Few more fixes to targetting and priorities, much smoother now