Tidy Makefile and fix %/image
Add maker