Various simplifications and serial control improvements