baxart wrote:

Great work!
In your unknown locations I'll add: main security/brig
|
"The
Enterprise Incident" suggested that the brig or some other holding facility was located on Deck 2. On the other hand, that turbolift ride from the bridge (traditionally Deck 1) and Deck 2 was awfully lengthy.