add to tuning, move stuff around