Fixed some fairly obvious errors, tuning may actually be possible now.