Changes on task ITTE-450

More fixes on the first task.