Adds option: updateData

This allowes to disabling automatic updating of the data
Some cleanup, adds image