updated pm
changes to code, added comment parsing
made appropriate changes, comment data, redid files, fixed merge conflicts