broke up headers, removed unneeded new methods

also added screenie and made things much more specific around the
codebase. unfortunately, also currently causes safe mode on respring