Right on, BTB! Are you using Final Draft? I like it a lot, it eliminates a lot of the dirty work. Good luck with that!
A childhood friend of mine wrote the screenplay for the Incredible Hulk movie a few years ago, when he sold it, I'd thought he'd blow a gasket. When they actually produced it, we had to peel him off the ceiling!