cleaned a few sections
Image polling and loading
Merge branch 'local' into dev

Almost finsihed with viewer, shuold be close.