Added image adding and various other tweaks.