I was horrible wrong about everything.

Changes:
* Put back INT/EXT checking for shot headers
* Renamesblocks with more proper names as opposed to ones just made up on the spot
* Add metrics comments and attempt to improve effectiveness of the proportions (but probably fail miserably)