Control scheme tweaks based on today's testing