more fixes
big ol' meaningless commit