Mainly changes to high-level plans, but also smaller fixes

Mosy of the fixes and changes are due to added features to high-level plans (such as pick and place), but also to add the `with-policy` feature (running plans with certain policies active).