Some tuning improvements, more to come