Full Map of Chapter 3 [Spoilers]

I haven't seen this posted yet so I thought I'd do it. I checked through the topics list and in the secrets thread but if I missed it, sorry.

If I missed anything please let me know! Also, if anyone wants to label interesting areas/secrets/etc. on this map, feel free.

There's another one hidden way down - to the room with sandwich recipe
http://www.youtube.com/watch?v=_k2IGynS8lE&t=2m45s

There's an additional passage near the top-right of the map (highlighted in yellow):

[mod]Added spoiler tags[/mod]

Edited with my known secret entrances