lots of editing.

renamed stuff to block. and... uh stuff