So, I went back to CS2, and went to Layers>Edit>Transform>Skew and pulled on the points that allowed me to straighten the wall beam, and then to straighten the table, causing the need to crop a bit off the right, left, and top. But it looks better to my eye now.