fixing a bunch of little bugs and tweeking with the styles a bit more