New Policy Proposals plus a few bugfixes