Reworked draw-image arity problem
There are no tests, most we can get travis to do is make sure the build compiles
Some more ignores