Dev/pf2

Some smaller fixes from the plugfest