Whole lotta tweaks