fixed most of the regression bugs. (almost) everything is sunshine, rainbows, and ponies now