Added fix 3, 4 and finishing touches