tuned, refactored, and moar compiler warnings

ohai, great code btw!