Merge pull request #183 from duncanspumpkin/master

More Gfx clean up
Fixed pattern bugs in new code