Ah, the first one is where I went - 科学技術館 (Kagakukijutsukan) in Kitanomaru park between the imperial palace and budoukan. It has some english (but, as always in Japan, knowing a little Japanese greatly helps), and the exhibits are fairly self-explanatory.

Good to know that there's another nice place to go.