De todo

New images, json load, and other improvements