Several changes to make gimmemotifs and pp play nice
Several changes to make gimmemotifs and pp play nice

simonvh/gimmemotifs,simonvh/gimmemotifs,simonvh/gimmemotifs,simonvh/gimmemotifs,simonvh/gimmemotifs,simonvh/gimmemotifs,simonvh/gimmemotifs