Update notes for submitted changes

* cleanup policy parsing a bit more