Fix some copy things
Simplify images
Use reference for makefile