After finishing assingment 1 in part II of the course. Fixing some minor bugs