patch/instance.updateAttributes: changes discussed on #1449

Pull Request created from #1720, since i've "lost" access to my older repo.
some general styling issues here too.