I'd like some advice on how to square up the window on the right side of the image. Thanks
First of all, I like both shots, especially the second. For the first, you might want to burn the corners to add emphasis to the window. As far as squaring it up, I think you are dealing with lens distortion. You can try either the lens correction filter or "warp" under the free transform function in photoshop to fix that.