LOTS of changes. period

(courtesy of http://whatthecommit.com)