Hey! Thanks for your enthusiasm :)
In response to your interrogations:
1. If the City has no valid cards, it must do a rearrangement!
2. You fill tracks at the end of a scene: go over each track, decide if what it represents has progressed somehow, and if so, check 1 box of the track.
I hope it clarifies things a little!