Finalizing IssueM changes, this should still be considered part of 2.0.0 release