UART fix + minor changes