diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index c3483d818..48a3d3d3f 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -26,6 +26,5 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **General information**
- - OpenTX version (e.g. 2.1.23 or N123)
- - Hardware (e.g. Frsky X9D+ or 9X Pro)
- - OpenTX Companion (e.g. 2.1.23 on Ubuntu 16.04)
+ - OpenI6X version (e.g. 1.8.0)
+ - Hardware (e.g. external module model)
diff --git a/README.md b/README.md
index 52bebefc6..a66c8d7e8 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 You can find instructions and videos contributed by fellow early adopters in the [RCGroups](https://www.rcgroups.com/forums/showthread.php?3916435-FlySky-I6X-port-of-OpenTX), [Telegram](https://t.me/otx_flysky_i6x), [Discord](https://discord.gg/3vKfYNTVa2) and [Rakish Rc](https://www.youtube.com/playlist?list=PLfzAEbvn4Bgr3ndNrwp87UimoKVhXkzBa) youtube tutorials. 
 
-For new contributions see [developers guide](https://github.com/OpenI6X/opentx/wiki/Contribute).
+For new contributions and how to build details see [developers guide](https://github.com/OpenI6X/opentx/wiki/Contribute).
 
 ## Table of Contents
 
@@ -29,17 +29,19 @@ Go to the [wiki](https://github.com/OpenI6X/opentx/wiki) for detailed steps.
 
 Comparison with original firmware:
 
-|                           | FlySky i6X | OpenTX i6X |
-|---------------------------|------------|------------|
-| Channels                  | 6/10       | 16         |
-| Mixers                    | 3          | 32         |
-| External module protocols | PPM        | PPM, CRSF  |
-| Logical switches          | _          | ✓          |
-| Global variables          | _          | ✓          |
-| Timers                    | _          | ✓          |
-| Nicer sounds              | _          | ✓          |
-| Use trims as buttons      | _          | ✓          |
-| ExpressLRS ready          | _          | ✓          |
+| Feature                   | FlySky i6X | OpenTX i6X                   |
+|---------------------------|------------|------------------------------|
+| Channels                  | 6/10       | 16                           |
+| Mixers                    | 3          | 32                           |
+| Models                    | 20         | 16 / unlimited<sup>[1]</sup> |
+| External module protocols | PPM        | PPM, CRSF                    |
+| Logical switches          | _          | ✓                            |
+| Global variables          | _          | ✓                            |
+| Timers                    | _          | ✓                            |
+| Nicer sounds              | _          | ✓                            |
+| Use trims as buttons      | _          | ✓                            |
+| ExpressLRS ready          | _          | ✓                            |
+<small>[1] Unlimited by using USB mass storage mode eeprom backup restore.</small>
 
 * Protocols:
   * AFHDS2A with SBUS, IBUS and extended SBUS16, IBUS16 - 16 channels modes
@@ -71,7 +73,7 @@ Comparison with original firmware:
 
 ## Shutdown
 
-FlySky FS-i6X don't have a software controlled shutdown button, therefore do not switch off you device when you see small square icon in top right corner of main screen - it indicates that there are settings not yet saved. Wait until it disappears or use "Save all" option from main screen popup menu.
+FlySky FS-i6X don't have a software controlled shutdown button, therefore do not switch off radio when you see `▫` icon in top right corner of main screen - it indicates that settings are not yet saved. Wait until it disappears or use "Save all" option from main screen popup menu.
 
 When to use "Save all" option:
 * When you don't want to wait until square icon disapper before shutdown.