block: moving a few things around
renaming and tweaks and such
don't touch anything