Merge pull request #62 from adrianp/pu-fixes

Minor fixes and additions