a shitload of alexy things...
merge conflicts?
a bunch of styling. well, all the styling.
Merge pull request #1 from gterrono/alex

Alex