more mini-refactorings; explicit for loops, loops over dict keys etc, more TODOs

parent 4cae8366

This commit is part of merge request !6. Comments created here will be created in the context of that merge request.