prov/psm: bug fix and todo list clean-up