Seperate PA additional values with ours & cleanup

This would make it much easier during merges