Ok guys, I've taken a lot of your suggestions and have updated the design. There are several changes the biggest of which, the building it bigger. This actually helped with things like the bathroom, since the staircase next to it didn't need more room.
I just updated the ones in the first post so go look there.
So once again, what do you think? Better, worse, not enough of a difference? It's okay, I can take it.