whoa, derp.  fixed a bunch of late-night coding mistakes