Fortress Update #5 - Defensive blundering part 2

So I f-ed up my moat by making it dig into my entrance tunnel.  So I decided to make a bigger wall and then make a moat around then.  Nothing can go wrong right?

Only that I dug into my underground farm now!  So now I made same mistake again only this time on a bigger scale.  I also had completely walled off my fort only to make another entrance OUTSIDE my wall.

I'm retarded.

A nice big wall with a moat around

Oops, I did it again (see red dotted line)