added image generation, more toolbox stuff