Fix makefile call
Fix copy
Clean up unnecessary handlers
Add semi-automated painting images
Add another couple of images