05 Data-input - Task 1-8 - Fixes