More work on various stuff
Image tweaking...
Demo cleanup