Fixed baudrate changing, changing back to 9600 on close
Cleaned up baudrate setting