update.py (and index.py) refactoring

Marcusrequested to merge
(removed):fix_760 into master

Originally a spin off from: !733 (closed)

closes #760 (closed)

closes #524

See commits for details.

Edited by Marcus

Merge request reports