More small changes, higher baudrate, error handling