You're right. I will probably come back to the FMG scene and rewrite it.
I also have plans to improve the sequence where you explore her apartment.