moar tweeking, now I'm done