Added pmtools structure
Minor corrections