Yeah, you are right, it was pretty off. Just went there and looked at it again. Should be better now.

Somewhat. I drew it from memory the next day after visiting the coffee shop. The corner with the coffee shop entrance might be more of an arch rather than an angle. I am also not really sure if it is connected to the smaller building next to it.