lot of minor changes, now click for images and so on